Varnish now requires that vdef.h is included before vas.h.

src/assert.c

@@ -42,6 +42,7 @@
 
 #include "trackrdrd.h"
 
+#include "vdef.h"
 #include "vas.h"
 
 static void __attribute__((__noreturn__))

src/child.c

@@ -63,8 +63,8 @@
 #include "vapi/vsm.h"
 #include "vapi/vsl.h"
 #include "miniobj.h"
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
 
 #define I_TAG "VSL"
 #define I_FILTER_VCL_LOG "VCL_log:^track "

src/config.c

@@ -45,8 +45,8 @@
 #include "trackrdrd.h"
 #include "config_common.h"
 
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
 
 #define DEFAULT_USER "nobody"
 

src/data.c

@@ -38,9 +38,9 @@
 #include "trackrdrd.h"
 #include "data.h"
 
+#include "vdef.h"
 #include "vas.h"
 #include "miniobj.h"
-#include "vdef.h"
 #include "vsb.h"
 
 /* Preprend head2 before head1, result in head1, head2 empty afterward */

src/handler.c

@@ -48,8 +48,8 @@
 #include <execinfo.h>
 #endif
 
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
 #include "vsb.h"
 
 #include "trackrdrd.h"

src/monitor.c

@@ -36,6 +36,7 @@
 #include <pthread.h>
 
 #include "trackrdrd.h"
+#include "vdef.h"
 #include "vas.h"
 
 static int run;

src/parse.c

@@ -36,6 +36,7 @@
 
 #include "trackrdrd.h"
 
+#include "vdef.h"
 #include "vas.h"
 
 static int

src/sandbox.c

@@ -37,6 +37,7 @@
 #include <sys/prctl.h>
 #endif
 
+#include "vdef.h"
 #include "vas.h"
 
 #include "trackrdrd.h"

src/spmcq.c

@@ -37,6 +37,7 @@
 #include <string.h>
 
 #include "trackrdrd.h"
+#include "vdef.h"
 #include "vas.h"
 #include "vqueue.h"
 

src/test/test_mq.c

@@ -35,6 +35,7 @@
 #include "minunit.h"
 
 #include "../trackrdrd.h"
+#include "vdef.h"
 #include "vas.h"
 
 #ifndef TESTDIR

src/trackrdrd.c

@@ -53,8 +53,8 @@
 #include <sys/types.h>
 #include <pwd.h>
 
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
 
 #include "trackrdrd.h"
 #include "config_common.h"

src/vpf.c

@@ -40,6 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "vfl.h"
 #include "vpf.h"

src/worker.c

@@ -37,9 +37,9 @@
 #include <errno.h>
 
 #include "trackrdrd.h"
+#include "vdef.h"
 #include "vas.h"
 #include "miniobj.h"
-#include "vdef.h"
 #include "vsb.h"
 
 #define VERSION_LEN 80