r793 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-11 09:11:32 +0200 (Fri, 11 Aug 2006)
New Revision: 793

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/flint.lnt
   trunk/varnish-cache/bin/varnishd/flint.sh
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/bin/varnishd/storage_file.c
   trunk/varnish-cache/bin/varnishd/tcp.c
Log:
Pull in ../../config.h when running flexelint.

Only include compat headers if we need them.


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-11 07:11:32 UTC (rev 793)
@@ -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"

Modified: trunk/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.lnt	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/flint.lnt	2006-08-11 07:11:32 UTC (rev 793)
@@ -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 ))
 

Modified: trunk/varnish-cache/bin/varnishd/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.sh	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/flint.sh	2006-08-11 07:11:32 UTC (rev 793)
@@ -5,7 +5,6 @@
 	-I/usr/include \
 	-I. \
 	-I../../include \
-	-DHAVE_KQUEUE \
 	flint.lnt \
 	*.c > $T 2>&1
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-08-11 07:11:32 UTC (rev 793)
@@ -17,7 +17,9 @@
 
 #include <err.h>		/* XXX */
 
+#ifndef HAVE_SETPROCTITLE
 #include "compat/setproctitle.h"
+#endif
 
 #include "heritage.h"
 #include "mgt.h"

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2006-08-11 07:11:32 UTC (rev 793)
@@ -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"

Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2006-08-11 07:11:32 UTC (rev 793)
@@ -23,7 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_ASPRINTF
 #include "compat/asprintf.h"
+#endif
 #include "shmlog.h"
 #include "cache.h"
 

Modified: trunk/varnish-cache/bin/varnishd/tcp.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/tcp.c	2006-08-11 07:03:19 UTC (rev 792)
+++ trunk/varnish-cache/bin/varnishd/tcp.c	2006-08-11 07:11:32 UTC (rev 793)
@@ -13,7 +13,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_STRLCPY
 #include "compat/strlcpy.h"
+#endif
 #include "heritage.h"
 #include "mgt.h"