[master] 82ac538 Make vrt.h explicitly depend on vdef.h

Poul-Henning Kamp phk at FreeBSD.org
Sat Sep 23 10:16:09 UTC 2017


commit 82ac538723e8c1625a357a9535f5575cc759319c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Sep 23 09:03:35 2017 +0000

    Make vrt.h explicitly depend on vdef.h

diff --git a/include/vrt.h b/include/vrt.h
index 3d59bfe..b8e1323 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -31,6 +31,11 @@
  * NB: When this file is changed, lib/libvcc/generate.py *MUST* be rerun.
  */
 
+#ifdef VRT_H_INCLUDED
+#  error "vrt.h included multiple times"
+#endif
+#define VRT_H_INCLUDED
+
 /***********************************************************************
  * Major and minor VRT API versions.
  *
@@ -73,12 +78,12 @@
 
 /***********************************************************************/
 
-#ifdef __v_printflike
-#  define __vrt_printflike(a,b) __v_printflike(a,b)
-#else
-#  define __vrt_printflike(a,b)
+#ifndef VDEF_H_INCLUDED
+#  error "include vdef.h before vrt.h"
 #endif
 
+/***********************************************************************/
+
 struct VCL_conf;
 struct vrt_acl;
 struct busyobj;
@@ -310,7 +315,7 @@ struct http *VRT_selecthttp(VRT_CTX, enum gethdr_e);
 const char *VRT_GetHdr(VRT_CTX, const struct gethdr_s *);
 void VRT_SetHdr(VRT_CTX, const struct gethdr_s *, const char *, ...);
 void VRT_handling(VRT_CTX, unsigned hand);
-void VRT_fail(VRT_CTX, const char *fmt, ...) __vrt_printflike(2,3);
+void VRT_fail(VRT_CTX, const char *fmt, ...) __v_printflike(2,3);
 
 void VRT_hashdata(VRT_CTX, const char *str, ...);
 


More information about the varnish-commit mailing list