From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 11 Aug 2006 07:11:32 +0000 (+0000)
Subject: Pull in ../../config.h when running flexelint.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6680e1694c0a626367c1da4efc603b584d65c5de;p=varnish

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 f51d6a9a..cb3a01a7 100644
--- 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 a26ab46d..90867c4b 100644
--- 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 1f2aca0e..e96821db 100644
--- 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 7dbca201..2230d401 100644
--- 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 323e3f5f..2a2e3285 100644
--- 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 0c288521..a0521fe7 100644
--- 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 803e22c1..2b644ef4 100644
--- 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"