Pull in ../../config.h when running flexelint.

Only include compat headers if we need them.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@793 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index f51d6a9ab3326164c9bcbf7ef327653f02102f5d..cb3a01a716cc5ca1bde26f9d665a494bacf18477 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -30,7 +30,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#ifndef HAVE_SRANDOMDEV
 #include "compat/srandomdev.h"
+#endif
 
 #include "heritage.h"
 #include "shmlog.h"

diff --git a/varnish-cache/bin/varnishd/flint.lnt b/varnish-cache/bin/varnishd/flint.lnt
index a26ab46d96dd1d4f06afedf98083901960b30604..90867c4bd2e7a69b3dd036e039e1a226db359960 100644 (file)
--- a/varnish-cache/bin/varnishd/flint.lnt
+++ b/varnish-cache/bin/varnishd/flint.lnt
@@ -2,6 +2,8 @@
 
 +libh mgt_event.h
 
+-header(../../config.h)
+
 // Fix strchr() semtics, it can only return NULL if arg2 != 0
 -sem(strchr, 1p, type(1), 2n == 0 ? (@p < 1p) : (@p < 1p || @p == 0 ))
 

diff --git a/varnish-cache/bin/varnishd/flint.sh b/varnish-cache/bin/varnishd/flint.sh
index 1f2aca0e993ce3de48f21c6553d19722688ee426..e96821db4a6b69b71340c196ec152f77b8564b01 100644 (file)
--- a/varnish-cache/bin/varnishd/flint.sh
+++ b/varnish-cache/bin/varnishd/flint.sh
@@ -5,7 +5,6 @@ flexelint \
        -I/usr/include \
        -I. \
        -I../../include \
-       -DHAVE_KQUEUE \
        flint.lnt \
        *.c > $T 2>&1
 

diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 7dbca2019889d84caddac24e7cd6d93a23fa4f4c..2230d401afa72a5216bf757745511a4e8e5dbc60 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -17,7 +17,9 @@
 
 #include <err.h>               /* XXX */
 
+#ifndef HAVE_SETPROCTITLE
 #include "compat/setproctitle.h"
+#endif
 
 #include "heritage.h"
 #include "mgt.h"

diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index 323e3f5fe5b0c1b4fd4d639baa863633292d4b9f..2a2e32855c882de48ac596a55c4c24ff7ce0260f 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -13,7 +13,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_VASPRINTF
 #include "compat/vasprintf.h"
+#endif
+
 #include "cli_priv.h"
 #include "cli.h"
 #include "vsb.h"

diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 0c288521340392c103dbc2d4eb08e0358d558649..a0521fe705b5d725aaabe7d815f9d24989b79fae 100644 (file)
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -23,7 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_ASPRINTF
 #include "compat/asprintf.h"
+#endif
 #include "shmlog.h"
 #include "cache.h"
 

diff --git a/varnish-cache/bin/varnishd/tcp.c b/varnish-cache/bin/varnishd/tcp.c
index 803e22c178433fcc4778518f566f19a718727c85..2b644ef4a25b12a8301f71f0d8608e613a0c717b 100644 (file)
--- a/varnish-cache/bin/varnishd/tcp.c
+++ b/varnish-cache/bin/varnishd/tcp.c
@@ -13,7 +13,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_STRLCPY
 #include "compat/strlcpy.h"
+#endif
 #include "heritage.h"
 #include "mgt.h"