r2564 - in branches/1.2: . bin bin/varnishadm bin/varnishd bin/varnishhist bin/varnishlog bin/varnishncsa bin/varnishreplay bin/varnishstat bin/varnishtop include lib/libvarnish lib/libvarnishapi lib/libvarnishcompat lib/libvcl

des at projects.linpro.no des at projects.linpro.no
Sat Mar 8 14:38:23 CET 2008 

Author: des
Date: 2008-03-08 14:38:23 +0100 (Sat, 08 Mar 2008)
New Revision: 2564

Modified:
   branches/1.2/
   branches/1.2/autogen.des
   branches/1.2/bin/Makefile.am
   branches/1.2/bin/varnishadm/Makefile.am
   branches/1.2/bin/varnishadm/varnishadm.c
   branches/1.2/bin/varnishd/Makefile.am
   branches/1.2/bin/varnishd/cache_acceptor.c
   branches/1.2/bin/varnishd/cache_acceptor_epoll.c
   branches/1.2/bin/varnishd/cache_acceptor_kqueue.c
   branches/1.2/bin/varnishd/cache_acceptor_poll.c
   branches/1.2/bin/varnishd/cache_backend.c
   branches/1.2/bin/varnishd/cache_ban.c
   branches/1.2/bin/varnishd/cache_center.c
   branches/1.2/bin/varnishd/cache_cli.c
   branches/1.2/bin/varnishd/cache_expire.c
   branches/1.2/bin/varnishd/cache_fetch.c
   branches/1.2/bin/varnishd/cache_hash.c
   branches/1.2/bin/varnishd/cache_http.c
   branches/1.2/bin/varnishd/cache_httpconn.c
   branches/1.2/bin/varnishd/cache_main.c
   branches/1.2/bin/varnishd/cache_panic.c
   branches/1.2/bin/varnishd/cache_pipe.c
   branches/1.2/bin/varnishd/cache_pool.c
   branches/1.2/bin/varnishd/cache_response.c
   branches/1.2/bin/varnishd/cache_session.c
   branches/1.2/bin/varnishd/cache_synthetic.c
   branches/1.2/bin/varnishd/cache_vary.c
   branches/1.2/bin/varnishd/cache_vcl.c
   branches/1.2/bin/varnishd/cache_vrt.c
   branches/1.2/bin/varnishd/cache_vrt_acl.c
   branches/1.2/bin/varnishd/cache_vrt_esi.c
   branches/1.2/bin/varnishd/cache_vrt_re.c
   branches/1.2/bin/varnishd/cache_ws.c
   branches/1.2/bin/varnishd/hash_classic.c
   branches/1.2/bin/varnishd/hash_simple_list.c
   branches/1.2/bin/varnishd/mgt_child.c
   branches/1.2/bin/varnishd/mgt_cli.c
   branches/1.2/bin/varnishd/mgt_event.c
   branches/1.2/bin/varnishd/mgt_param.c
   branches/1.2/bin/varnishd/mgt_vcc.c
   branches/1.2/bin/varnishd/rfc2616.c
   branches/1.2/bin/varnishd/shmlog.c
   branches/1.2/bin/varnishd/stevedore.c
   branches/1.2/bin/varnishd/storage_file.c
   branches/1.2/bin/varnishd/storage_malloc.c
   branches/1.2/bin/varnishd/tcp.c
   branches/1.2/bin/varnishd/varnishd.c
   branches/1.2/bin/varnishhist/Makefile.am
   branches/1.2/bin/varnishhist/varnishhist.c
   branches/1.2/bin/varnishlog/Makefile.am
   branches/1.2/bin/varnishlog/varnishlog.c
   branches/1.2/bin/varnishncsa/Makefile.am
   branches/1.2/bin/varnishncsa/varnishncsa.c
   branches/1.2/bin/varnishreplay/Makefile.am
   branches/1.2/bin/varnishreplay/varnishreplay.c
   branches/1.2/bin/varnishstat/Makefile.am
   branches/1.2/bin/varnishstat/varnishstat.c
   branches/1.2/bin/varnishtop/Makefile.am
   branches/1.2/bin/varnishtop/varnishtop.c
   branches/1.2/configure.ac
   branches/1.2/include/binary_heap.h
   branches/1.2/lib/libvarnish/Makefile.am
   branches/1.2/lib/libvarnish/argv.c
   branches/1.2/lib/libvarnish/assert.c
   branches/1.2/lib/libvarnish/binary_heap.c
   branches/1.2/lib/libvarnish/cli.c
   branches/1.2/lib/libvarnish/cli_common.c
   branches/1.2/lib/libvarnish/crc32.c
   branches/1.2/lib/libvarnish/flopen.c
   branches/1.2/lib/libvarnish/time.c
   branches/1.2/lib/libvarnish/version.c
   branches/1.2/lib/libvarnish/vpf.c
   branches/1.2/lib/libvarnish/vsb.c
   branches/1.2/lib/libvarnish/vss.c
   branches/1.2/lib/libvarnish/vtmpfile.c
   branches/1.2/lib/libvarnishapi/Makefile.am
   branches/1.2/lib/libvarnishapi/base64.c
   branches/1.2/lib/libvarnishapi/instance.c
   branches/1.2/lib/libvarnishapi/shmlog.c
   branches/1.2/lib/libvarnishcompat/Makefile.am
   branches/1.2/lib/libvarnishcompat/asprintf.c
   branches/1.2/lib/libvarnishcompat/daemon.c
   branches/1.2/lib/libvarnishcompat/setproctitle.c
   branches/1.2/lib/libvarnishcompat/srandomdev.c
   branches/1.2/lib/libvarnishcompat/strlcat.c
   branches/1.2/lib/libvarnishcompat/strlcpy.c
   branches/1.2/lib/libvarnishcompat/strndup.c
   branches/1.2/lib/libvarnishcompat/vasprintf.c
   branches/1.2/lib/libvarnishcompat/vis.c
   branches/1.2/lib/libvcl/Makefile.am
   branches/1.2/lib/libvcl/vcc_acl.c
   branches/1.2/lib/libvcl/vcc_action.c
   branches/1.2/lib/libvcl/vcc_backend.c
   branches/1.2/lib/libvcl/vcc_compile.c
   branches/1.2/lib/libvcl/vcc_fixed_token.c
   branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl
   branches/1.2/lib/libvcl/vcc_gen_obj.tcl
   branches/1.2/lib/libvcl/vcc_obj.c
   branches/1.2/lib/libvcl/vcc_parse.c
   branches/1.2/lib/libvcl/vcc_string.c
   branches/1.2/lib/libvcl/vcc_token.c
   branches/1.2/lib/libvcl/vcc_var.c
   branches/1.2/lib/libvcl/vcc_xref.c
Log:
Merged revisions 2404,2426,2432-2434,2453-2456,2458-2461 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2404 | phk | 2008-01-30 11:02:19 +0100 (Wed, 30 Jan 2008) | 4 lines
  
  Make sure we get the right assert() macro.
  
  Constification.
........
  r2453 | des | 2008-02-13 14:05:36 +0100 (Wed, 13 Feb 2008) | 4 lines
  
  Some source files (especially in libraries) have embedded test
  programs.  Add a configure option and a corresponding automake
  conditional to enable these tests.
........
  r2454 | des | 2008-02-13 14:29:40 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Rewrite str2bytes, add unit test
........
  r2455 | des | 2008-02-13 14:55:39 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Use #include "config.h" instead of -include config.h
........
  r2456 | des | 2008-02-13 15:58:48 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Disable tools that require curses if no curses library was found.
........
  r2458 | des | 2008-02-13 18:12:59 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Enable tests + allow overrides from command line.
........
  r2459 | des | 2008-02-13 18:19:52 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Never mind trying to avoid libm, we already use it anyway.
........
  r2460 | des | 2008-02-13 18:25:52 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Forgot config.h here
........
  r2461 | des | 2008-02-13 18:25:57 +0100 (Wed, 13 Feb 2008) | 2 lines
  
  Regenerate
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321,2323-2327,2358,2362-2364,2366,2374-2381,2384-2386,2414-2415,2426,2432-2434,2444-2445,2457,2492-2494,2500-2502
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321,2323-2327,2358,2362-2364,2366,2374-2381,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2492-2494,2500-2502

Modified: branches/1.2/autogen.des
===================================================================
--- branches/1.2/autogen.des	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/autogen.des	2008-03-08 13:38:23 UTC (rev 2564)
@@ -18,6 +18,8 @@
     --enable-diagnostics \
     --enable-extra-developer-warnings \
     --enable-stack-protector \
+    --enable-tests \
     --enable-werror \
     --prefix=/opt/varnish \
-    --mandir=/opt/varnish/man
+    --mandir=/opt/varnish/man \
+    "$@"

Modified: branches/1.2/bin/Makefile.am
===================================================================
--- branches/1.2/bin/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -1,4 +1,7 @@
 # $Id$
 
-SUBDIRS = varnishadm varnishd varnishhist varnishlog varnishncsa \
-	varnishreplay varnishstat varnishtop
+SUBDIRS = varnishadm varnishd varnishlog varnishncsa varnishreplay
+
+if HAVE_CURSES
+SUBDIRS += varnishhist varnishstat varnishtop
+endif

Modified: branches/1.2/bin/varnishadm/Makefile.am
===================================================================
--- branches/1.2/bin/varnishadm/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishadm/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishadm_SOURCES = \
 	varnishadm.c
-	
-varnishadm_CFLAGS = -include config.h
 
 varnishadm_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \

Modified: branches/1.2/bin/varnishadm/varnishadm.c
===================================================================
--- branches/1.2/bin/varnishadm/varnishadm.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishadm/varnishadm.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

Modified: branches/1.2/bin/varnishd/Makefile.am
===================================================================
--- branches/1.2/bin/varnishd/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -65,7 +65,7 @@
 	steps.h \
 	stevedore.h
 
-varnishd_CFLAGS = -include config.h \
+varnishd_CFLAGS = \
         -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
 varnishd_LDFLAGS = -export-dynamic

Modified: branches/1.2/bin/varnishd/cache_acceptor.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_acceptor.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -33,6 +33,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <poll.h>

Modified: branches/1.2/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_epoll.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_acceptor_epoll.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #if defined(HAVE_EPOLL_CTL)
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_kqueue.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_acceptor_kqueue.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -33,6 +33,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #if defined(HAVE_KQUEUE)
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_acceptor_poll.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_poll.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_acceptor_poll.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #if defined(HAVE_POLL)
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_backend.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_backend.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -32,6 +32,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

Modified: branches/1.2/bin/varnishd/cache_ban.c
===================================================================
--- branches/1.2/bin/varnishd/cache_ban.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_ban.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Ban processing
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/cache_center.c
===================================================================
--- branches/1.2/bin/varnishd/cache_center.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_center.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -56,6 +56,8 @@
 DOT acceptor -> start [style=bold,color=green,weight=4]
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>

Modified: branches/1.2/bin/varnishd/cache_cli.c
===================================================================
--- branches/1.2/bin/varnishd/cache_cli.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_cli.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/cache_expire.c
===================================================================
--- branches/1.2/bin/varnishd/cache_expire.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_expire.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -38,6 +38,8 @@
  * XXX: are ready.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/cache_fetch.c
===================================================================
--- branches/1.2/bin/varnishd/cache_fetch.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_fetch.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/cache_hash.c
===================================================================
--- branches/1.2/bin/varnishd/cache_hash.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_hash.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -52,6 +52,8 @@
  * not busy only once.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/cache_http.c
===================================================================
--- branches/1.2/bin/varnishd/cache_http.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_http.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * HTTP request storage and manipulation
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>

Modified: branches/1.2/bin/varnishd/cache_httpconn.c
===================================================================
--- branches/1.2/bin/varnishd/cache_httpconn.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_httpconn.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * HTTP protocol requests
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>

Modified: branches/1.2/bin/varnishd/cache_main.c
===================================================================
--- branches/1.2/bin/varnishd/cache_main.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_main.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/cache_panic.c
===================================================================
--- branches/1.2/bin/varnishd/cache_panic.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_panic.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_pipe.c
===================================================================
--- branches/1.2/bin/varnishd/cache_pipe.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_pipe.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * XXX: charge bytes to srcaddr
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.2/bin/varnishd/cache_pool.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_pool.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * XXX: automatic thread-pool size adaptation.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 

Modified: branches/1.2/bin/varnishd/cache_response.c
===================================================================
--- branches/1.2/bin/varnishd/cache_response.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_response.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 

Modified: branches/1.2/bin/varnishd/cache_session.c
===================================================================
--- branches/1.2/bin/varnishd/cache_session.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_session.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -48,6 +48,8 @@
  * XXX: we still have to do the source-addr lookup.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>

Modified: branches/1.2/bin/varnishd/cache_synthetic.c
===================================================================
--- branches/1.2/bin/varnishd/cache_synthetic.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_synthetic.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 

Modified: branches/1.2/bin/varnishd/cache_vary.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vary.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vary.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -54,6 +54,8 @@
  *      '\0'
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/cache_vcl.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vcl.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vcl.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -33,6 +33,8 @@
  * The interface *from* the compiled VCL code is in cache_vrt.c.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/cache_vrt.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vrt.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Runtime support for compiled VCL programs
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 

Modified: branches/1.2/bin/varnishd/cache_vrt_acl.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_acl.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vrt_acl.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -34,6 +34,8 @@
  * XXX: a refresh facility.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_vrt_esi.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_esi.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vrt_esi.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Runtime support for compiled VCL programs
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/cache_vrt_re.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_re.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_vrt_re.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Runtime support for compiled VCL programs, regexps
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/cache_ws.c
===================================================================
--- branches/1.2/bin/varnishd/cache_ws.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/cache_ws.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 

Modified: branches/1.2/bin/varnishd/hash_classic.c
===================================================================
--- branches/1.2/bin/varnishd/hash_classic.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/hash_classic.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * A classic bucketed hash
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/hash_simple_list.c
===================================================================
--- branches/1.2/bin/varnishd/hash_simple_list.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/hash_simple_list.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * This is the reference hash(/lookup) implementation
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/mgt_child.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_child.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/mgt_child.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * The mechanics of handling the child process
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_cli.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/mgt_cli.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * The management process' CLI handling
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdarg.h>

Modified: branches/1.2/bin/varnishd/mgt_event.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_event.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/mgt_event.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <poll.h>

Modified: branches/1.2/bin/varnishd/mgt_param.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_param.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/mgt_param.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 

Modified: branches/1.2/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_vcc.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/mgt_vcc.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * VCL compiler stuff
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 

Modified: branches/1.2/bin/varnishd/rfc2616.c
===================================================================
--- branches/1.2/bin/varnishd/rfc2616.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/rfc2616.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>

Modified: branches/1.2/bin/varnishd/shmlog.c
===================================================================
--- branches/1.2/bin/varnishd/shmlog.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/shmlog.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

Modified: branches/1.2/bin/varnishd/stevedore.c
===================================================================
--- branches/1.2/bin/varnishd/stevedore.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/stevedore.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: branches/1.2/bin/varnishd/storage_file.c
===================================================================
--- branches/1.2/bin/varnishd/storage_file.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/storage_file.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Storage method based on mmap'ed file
  */
 
+#include "config.h"
+
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/socket.h>

Modified: branches/1.2/bin/varnishd/storage_malloc.c
===================================================================
--- branches/1.2/bin/varnishd/storage_malloc.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/storage_malloc.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Storage method based on malloc(3)
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdlib.h>

Modified: branches/1.2/bin/varnishd/tcp.c
===================================================================
--- branches/1.2/bin/varnishd/tcp.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/tcp.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 

Modified: branches/1.2/bin/varnishd/varnishd.c
===================================================================
--- branches/1.2/bin/varnishd/varnishd.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishd/varnishd.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * The management process and CLI handling
  */
 
+#include "config.h"
+
 #include <sys/stat.h>
 
 #include <ctype.h>

Modified: branches/1.2/bin/varnishhist/Makefile.am
===================================================================
--- branches/1.2/bin/varnishhist/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishhist/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishhist_SOURCES = varnishhist.c
 
-varnishhist_CFLAGS = -include config.h
-
 varnishhist_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \

Modified: branches/1.2/bin/varnishhist/varnishhist.c
===================================================================
--- branches/1.2/bin/varnishhist/varnishhist.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishhist/varnishhist.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <curses.h>
 #include <errno.h>
 #include <limits.h>

Modified: branches/1.2/bin/varnishlog/Makefile.am
===================================================================
--- branches/1.2/bin/varnishlog/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishlog/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishlog_SOURCES = varnishlog.c
 
-varnishlog_CFLAGS = -include config.h
-
 varnishlog_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \

Modified: branches/1.2/bin/varnishlog/varnishlog.c
===================================================================
--- branches/1.2/bin/varnishlog/varnishlog.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishlog/varnishlog.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <regex.h>

Modified: branches/1.2/bin/varnishncsa/Makefile.am
===================================================================
--- branches/1.2/bin/varnishncsa/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishncsa/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishncsa_SOURCES = varnishncsa.c
 
-varnishncsa_CFLAGS = -include config.h
-
 varnishncsa_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \

Modified: branches/1.2/bin/varnishncsa/varnishncsa.c
===================================================================
--- branches/1.2/bin/varnishncsa/varnishncsa.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishncsa/varnishncsa.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -59,6 +59,8 @@
  *		- Maybe rotate/compress log
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>

Modified: branches/1.2/bin/varnishreplay/Makefile.am
===================================================================
--- branches/1.2/bin/varnishreplay/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishreplay/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishreplay_SOURCES = \
 	varnishreplay.c
-	
-varnishreplay_CFLAGS = -include config.h
 
 varnishreplay_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \

Modified: branches/1.2/bin/varnishreplay/varnishreplay.c
===================================================================
--- branches/1.2/bin/varnishreplay/varnishreplay.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishreplay/varnishreplay.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

Modified: branches/1.2/bin/varnishstat/Makefile.am
===================================================================
--- branches/1.2/bin/varnishstat/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishstat/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishstat_SOURCES = varnishstat.c
 
-varnishstat_CFLAGS = -include config.h
-
 varnishstat_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \

Modified: branches/1.2/bin/varnishstat/varnishstat.c
===================================================================
--- branches/1.2/bin/varnishstat/varnishstat.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishstat/varnishstat.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <sys/time.h>
 
 #include <curses.h>

Modified: branches/1.2/bin/varnishtop/Makefile.am
===================================================================
--- branches/1.2/bin/varnishtop/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishtop/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -8,8 +8,6 @@
 
 varnishtop_SOURCES = varnishtop.c
 
-varnishtop_CFLAGS = -include config.h
-
 varnishtop_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \

Modified: branches/1.2/bin/varnishtop/varnishtop.c
===================================================================
--- branches/1.2/bin/varnishtop/varnishtop.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/bin/varnishtop/varnishtop.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <curses.h>
 #include <errno.h>

Modified: branches/1.2/configure.ac
===================================================================
--- branches/1.2/configure.ac	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/configure.ac	2008-03-08 13:38:23 UTC (rev 2564)
@@ -38,10 +38,15 @@
 
 save_LIBS="${LIBS}"
 LIBS=""
-AC_SEARCH_LIBS(initscr, [curses ncurses])
+AC_SEARCH_LIBS(initscr, [curses ncurses],
+	[have_curses=yes], [have_curses=no])
 CURSES_LIBS="${LIBS}"
 LIBS="${save_LIBS}"
 AC_SUBST(CURSES_LIBS)
+if test "$have_curses" = no; then
+	AC_MSG_WARN([curses not found; some tools will not be built])
+fi
+AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
 
 save_LIBS="${LIBS}"
 LIBS=""
@@ -182,6 +187,11 @@
 AC_ARG_ENABLE(stack-protector,
 	AS_HELP_STRING([--enable-stack-protector],[enable stack protector (default is NO)]),
 	CFLAGS="${CFLAGS} -fstack-protector-all")
+
+AC_ARG_ENABLE(tests,
+	AS_HELP_STRING([--enable-tests],[build test programs (default is NO)]))
+AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes])
+
 AC_ARG_ENABLE(werror,
 	AS_HELP_STRING([--enable-werror],[use -Werror (default is NO)]),
 	CFLAGS="${CFLAGS} -Werror")

Modified: branches/1.2/include/binary_heap.h
===================================================================
--- branches/1.2/include/binary_heap.h	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/include/binary_heap.h	2008-03-08 13:38:23 UTC (rev 2564)
@@ -69,7 +69,7 @@
 	 * The root item has 'idx' zero
 	 */
 
-void *binheap_root(struct binheap *);
+void *binheap_root(const struct binheap *);
 	/*
 	 * Return the root item
 	 */

Modified: branches/1.2/lib/libvarnish/Makefile.am
===================================================================
--- branches/1.2/lib/libvarnish/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -19,6 +19,17 @@
 	vss.c \
 	vtmpfile.c
 
-libvarnish_la_CFLAGS = -include config.h
+libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
 
-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS}
+TESTS = num_c_test
+
+if ENABLE_TESTS
+noinst_PROGRAMS = ${TESTS}
+
+num_c_test_SOURCES = num.c
+num_c_test_CFLAGS = -DNUM_C_TEST -include config.h
+num_c_test_LDADD = ${LIBM}
+
+test: ${TESTS}
+	@for test in ${TESTS} ; do ./$${test} ; done
+endif

Modified: branches/1.2/lib/libvarnish/argv.c
===================================================================
--- branches/1.2/lib/libvarnish/argv.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/argv.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -38,6 +38,8 @@
  *
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>

Modified: branches/1.2/lib/libvarnish/assert.c
===================================================================
--- branches/1.2/lib/libvarnish/assert.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/assert.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

Modified: branches/1.2/lib/libvarnish/binary_heap.c
===================================================================
--- branches/1.2/lib/libvarnish/binary_heap.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/binary_heap.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -36,11 +36,13 @@
  * XXX: the array is not scaled back when items are deleted.
  */
 
-#include <assert.h>
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 
 #include "binary_heap.h"
+#include "libvarnish.h"
 
 /* Private definitions -----------------------------------------------*/
 
@@ -186,7 +188,7 @@
 }
 
 void *
-binheap_root(struct binheap *bh)
+binheap_root(const struct binheap *bh)
 {
 
 	assert(bh != NULL);

Modified: branches/1.2/lib/libvarnish/cli.c
===================================================================
--- branches/1.2/lib/libvarnish/cli.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/cli.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Stuff for handling the CLI protocol
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>

Modified: branches/1.2/lib/libvarnish/cli_common.c
===================================================================
--- branches/1.2/lib/libvarnish/cli_common.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/cli_common.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 

Modified: branches/1.2/lib/libvarnish/crc32.c
===================================================================
--- branches/1.2/lib/libvarnish/crc32.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/crc32.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * This CRC32 implementation is in the public domain.
  */
 
+#include "config.h"
+
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------*/

Modified: branches/1.2/lib/libvarnish/flopen.c
===================================================================
--- branches/1.2/lib/libvarnish/flopen.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/flopen.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $FreeBSD: src/lib/libutil/flopen.c,v 1.7 2007/05/23 12:09:33 des Exp $
  */
 
+#include "config.h"
+
 #include <sys/file.h>
 #include <sys/stat.h>
 

Modified: branches/1.2/lib/libvarnish/time.c
===================================================================
--- branches/1.2/lib/libvarnish/time.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/time.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -46,6 +46,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/time.h>
 
 #include <stdio.h>

Modified: branches/1.2/lib/libvarnish/version.c
===================================================================
--- branches/1.2/lib/libvarnish/version.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/version.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * Display a standardized version message.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "libvarnish.h"

Modified: branches/1.2/lib/libvarnish/vpf.c
===================================================================
--- branches/1.2/lib/libvarnish/vpf.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/vpf.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -28,6 +28,8 @@
  * $FreeBSD: src/lib/libutil/pidfile.c,v 1.5 2007/05/11 11:10:05 des Exp $
  */
 
+#include "config.h"
+
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>

Modified: branches/1.2/lib/libvarnish/vsb.c
===================================================================
--- branches/1.2/lib/libvarnish/vsb.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/vsb.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30 2005/12/23 11:49:53 phk Exp $
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>

Modified: branches/1.2/lib/libvarnish/vss.c
===================================================================
--- branches/1.2/lib/libvarnish/vss.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/vss.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 

Modified: branches/1.2/lib/libvarnish/vtmpfile.c
===================================================================
--- branches/1.2/lib/libvarnish/vtmpfile.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnish/vtmpfile.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

Modified: branches/1.2/lib/libvarnishapi/Makefile.am
===================================================================
--- branches/1.2/lib/libvarnishapi/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishapi/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -9,5 +9,5 @@
 	instance.c \
 	shmlog.c
 
-libvarnishapi_la_CFLAGS = -include config.h \
+libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'

Modified: branches/1.2/lib/libvarnishapi/base64.c
===================================================================
--- branches/1.2/lib/libvarnishapi/base64.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishapi/base64.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -6,6 +6,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <stdint.h>
 #include "varnishapi.h"

Modified: branches/1.2/lib/libvarnishapi/instance.c
===================================================================
--- branches/1.2/lib/libvarnishapi/instance.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishapi/instance.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>

Modified: branches/1.2/lib/libvarnishapi/shmlog.c
===================================================================
--- branches/1.2/lib/libvarnishapi/shmlog.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishapi/shmlog.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,9 @@
  * $Id$
  */
 
+#include "config.h"
+
+#include <sys/types.h>
 #include <sys/mman.h>
 
 #include <assert.h>

Modified: branches/1.2/lib/libvarnishcompat/Makefile.am
===================================================================
--- branches/1.2/lib/libvarnishcompat/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -14,5 +14,3 @@
 	strlcpy.c \
 	strndup.c \
 	vis.c
-
-libvarnishcompat_la_CFLAGS = -include config.h

Modified: branches/1.2/lib/libvarnishcompat/asprintf.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/asprintf.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/asprintf.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_ASPRINTF
 
 #include <stdarg.h>

Modified: branches/1.2/lib/libvarnishcompat/daemon.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/daemon.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/daemon.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * $FreeBSD: src/lib/libc/gen/daemon.c,v 1.8 2007/01/09 00:27:53 imp Exp $
  */
 
+#include "config.h"
+
 #ifndef HAVE_DAEMON
 
 #include <errno.h>

Modified: branches/1.2/lib/libvarnishcompat/setproctitle.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/setproctitle.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/setproctitle.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #ifndef HAVE_SETPROCTITLE
 
 #include <stdarg.h>

Modified: branches/1.2/lib/libvarnishcompat/srandomdev.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/srandomdev.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/srandomdev.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #ifndef HAVE_SRANDOMDEV
 
 #include <sys/time.h>

Modified: branches/1.2/lib/libvarnishcompat/strlcat.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/strlcat.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/strlcat.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -17,6 +17,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRLCAT
 
 #include <sys/types.h>

Modified: branches/1.2/lib/libvarnishcompat/strlcpy.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/strlcpy.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/strlcpy.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -17,6 +17,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRLCPY
 
 #include <sys/types.h>

Modified: branches/1.2/lib/libvarnishcompat/strndup.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/strndup.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/strndup.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRNDUP
 
 #include <stdlib.h>

Modified: branches/1.2/lib/libvarnishcompat/vasprintf.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/vasprintf.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/vasprintf.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_VASPRINTF
 
 #include <stdarg.h>

Modified: branches/1.2/lib/libvarnishcompat/vis.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/vis.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvarnishcompat/vis.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -31,6 +31,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #if !defined(HAVE_VIS) || !defined(HAVE_STRVIS) || !defined(HAVE_STRVISX)
 
 #include <sys/types.h>

Modified: branches/1.2/lib/libvcl/Makefile.am
===================================================================
--- branches/1.2/lib/libvcl/Makefile.am	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/Makefile.am	2008-03-08 13:38:23 UTC (rev 2564)
@@ -20,5 +20,3 @@
 	vcc_token.c \
 	vcc_var.c \
 	vcc_xref.c
-
-libvcl_la_CFLAGS = -include config.h

Modified: branches/1.2/lib/libvcl/vcc_acl.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_acl.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_acl.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 

Modified: branches/1.2/lib/libvcl/vcc_action.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_action.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_action.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "vsb.h"

Modified: branches/1.2/lib/libvcl/vcc_backend.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_backend.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_backend.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 

Modified: branches/1.2/lib/libvcl/vcc_compile.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_compile.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_compile.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -60,6 +60,8 @@
  *	and all the rest...
  */
 
+#include "config.h"
+
 #include <sys/stat.h>
 
 #include <ctype.h>

Modified: branches/1.2/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_fixed_token.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_fixed_token.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -6,6 +6,7 @@
  * Edit vcc_gen_fixed_token.tcl instead
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <ctype.h>
 #include "vcc_priv.h"

Modified: branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl	2008-03-08 13:38:23 UTC (rev 2564)
@@ -220,6 +220,7 @@
 set foh [open "vcc_token_defs.h" w]
 warns $foh
 
+puts $fo "#include \"config.h\""
 puts $fo "#include <stdio.h>"
 puts $fo "#include <ctype.h>"
 puts $fo "#include \"vcc_priv.h\""

Modified: branches/1.2/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2008-03-08 13:38:23 UTC (rev 2564)
@@ -296,6 +296,7 @@
 	puts $fo "\t{ NULL }"
 }
 
+puts $fo "#include \"config.h\""
 puts $fo "#include <stdio.h>"
 puts $fo "#include \"vcc_compile.h\""
 puts $fo ""

Modified: branches/1.2/lib/libvcl/vcc_obj.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_obj.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_obj.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -6,6 +6,7 @@
  * Edit vcc_gen_obj.tcl instead
  */
 
+#include "config.h"
 #include <stdio.h>
 #include "vcc_compile.h"
 

Modified: branches/1.2/lib/libvcl/vcc_parse.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_parse.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_parse.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 

Modified: branches/1.2/lib/libvcl/vcc_string.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_string.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_string.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 

Modified: branches/1.2/lib/libvcl/vcc_token.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_token.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_token.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: branches/1.2/lib/libvcl/vcc_var.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_var.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_var.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 

Modified: branches/1.2/lib/libvcl/vcc_xref.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_xref.c	2008-03-08 13:12:02 UTC (rev 2563)
+++ branches/1.2/lib/libvcl/vcc_xref.c	2008-03-08 13:38:23 UTC (rev 2564)
@@ -39,6 +39,8 @@
  * they are called.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "vsb.h"

More information about the varnish-commit mailing list