From 4b3abcbea90a5cabc782b90a5e9c514a6b6d4c21 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 20 Oct 2008 18:47:24 +0000 Subject: [PATCH] Revert r3072, which was a no-op. Add "config.h" where it's missing. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3336 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishadm/varnishadm.c | 1 - varnish-cache/bin/varnishd/cache_center.c | 1 - varnish-cache/bin/varnishd/cache_http.c | 1 - varnish-cache/bin/varnishd/cache_panic.c | 1 - varnish-cache/bin/varnishd/mgt_child.c | 1 - varnish-cache/bin/varnishd/mgt_cli.c | 1 - varnish-cache/bin/varnishd/mgt_param.c | 1 - varnish-cache/bin/varnishd/mgt_vcc.c | 1 - varnish-cache/bin/varnishd/storage_file.c | 1 - varnish-cache/bin/varnishhist/varnishhist.c | 1 - varnish-cache/bin/varnishlog/varnishlog.c | 1 - varnish-cache/bin/varnishncsa/varnishncsa.c | 1 - varnish-cache/bin/varnishreplay/varnishreplay.c | 1 - varnish-cache/bin/varnishstat/varnishstat.c | 1 - varnish-cache/bin/varnishtest/vtc.c | 2 ++ varnish-cache/bin/varnishtest/vtc_client.c | 2 ++ varnish-cache/bin/varnishtest/vtc_http.c | 3 +++ varnish-cache/bin/varnishtest/vtc_log.c | 2 ++ varnish-cache/bin/varnishtest/vtc_sema.c | 2 ++ varnish-cache/bin/varnishtest/vtc_server.c | 1 + varnish-cache/bin/varnishtest/vtc_varnish.c | 1 + varnish-cache/bin/varnishtop/varnishtop.c | 1 - varnish-cache/lib/libvarnish/argv.c | 1 - varnish-cache/lib/libvarnish/assert.c | 1 - varnish-cache/lib/libvarnish/binary_heap.c | 1 - varnish-cache/lib/libvarnish/cli_common.c | 1 - varnish-cache/lib/libvarnish/flopen.c | 1 - varnish-cache/lib/libvarnish/time.c | 1 - varnish-cache/lib/libvarnish/vct.c | 2 ++ varnish-cache/lib/libvarnish/version.c | 1 - varnish-cache/lib/libvarnish/vlu.c | 2 ++ varnish-cache/lib/libvarnish/vpf.c | 1 - varnish-cache/lib/libvarnish/vss.c | 1 - varnish-cache/lib/libvarnish/vtmpfile.c | 1 - varnish-cache/lib/libvarnishapi/base64.c | 1 - varnish-cache/lib/libvarnishapi/instance.c | 1 - varnish-cache/lib/libvarnishapi/shmlog.c | 1 - varnish-cache/lib/libvcl/vcc_acl.c | 1 - varnish-cache/lib/libvcl/vcc_action.c | 1 - varnish-cache/lib/libvcl/vcc_backend.c | 1 - varnish-cache/lib/libvcl/vcc_compile.c | 1 - varnish-cache/lib/libvcl/vcc_fixed_token.c | 1 - varnish-cache/lib/libvcl/vcc_parse.c | 1 - varnish-cache/lib/libvcl/vcc_string.c | 1 - varnish-cache/lib/libvcl/vcc_token.c | 1 - varnish-cache/lib/libvcl/vcc_var.c | 1 - varnish-cache/lib/libvcl/vcc_xref.c | 1 - 47 files changed, 17 insertions(+), 38 deletions(-) diff --git a/varnish-cache/bin/varnishadm/varnishadm.c b/varnish-cache/bin/varnishadm/varnishadm.c index 45bccd0e..5616188e 100644 --- a/varnish-cache/bin/varnishadm/varnishadm.c +++ b/varnish-cache/bin/varnishadm/varnishadm.c @@ -36,7 +36,6 @@ #include #include -#include "config.h" #include "libvarnish.h" #include "vss.h" diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c index 57b16051..c05916c8 100644 --- a/varnish-cache/bin/varnishd/cache_center.c +++ b/varnish-cache/bin/varnishd/cache_center.c @@ -67,7 +67,6 @@ DOT acceptor -> start [style=bold,color=green,weight=4] #include #include -#include "config.h" #ifndef HAVE_SRANDOMDEV #include "compat/srandomdev.h" #endif diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c index d35ab4e4..c93a37a9 100644 --- a/varnish-cache/bin/varnishd/cache_http.c +++ b/varnish-cache/bin/varnishd/cache_http.c @@ -41,7 +41,6 @@ #include #include -#include "config.h" #include "shmlog.h" #include "vct.h" #include "cache.h" diff --git a/varnish-cache/bin/varnishd/cache_panic.c b/varnish-cache/bin/varnishd/cache_panic.c index f1e533b2..fd425af5 100644 --- a/varnish-cache/bin/varnishd/cache_panic.c +++ b/varnish-cache/bin/varnishd/cache_panic.c @@ -37,7 +37,6 @@ #include #include -#include "config.h" #include "cache.h" #include "cache_backend.h" #include "vcl.h" diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c index 2ded8506..2469378f 100644 --- a/varnish-cache/bin/varnishd/mgt_child.c +++ b/varnish-cache/bin/varnishd/mgt_child.c @@ -45,7 +45,6 @@ #include #include -#include "config.h" #ifndef HAVE_SETPROCTITLE #include "compat/setproctitle.h" #endif diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c index d4358861..827cddf1 100644 --- a/varnish-cache/bin/varnishd/mgt_cli.c +++ b/varnish-cache/bin/varnishd/mgt_cli.c @@ -45,7 +45,6 @@ #include #include -#include "config.h" #ifndef HAVE_VASPRINTF #include "compat/vasprintf.h" #endif diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c index bfa09034..202bf4d3 100644 --- a/varnish-cache/bin/varnishd/mgt_param.c +++ b/varnish-cache/bin/varnishd/mgt_param.c @@ -43,7 +43,6 @@ #include #include -#include "config.h" #include "cli.h" #include "cli_priv.h" #include "cli_common.h" diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c index 7ce416c6..0c2d8402 100644 --- a/varnish-cache/bin/varnishd/mgt_vcc.c +++ b/varnish-cache/bin/varnishd/mgt_vcc.c @@ -43,7 +43,6 @@ #include #include -#include "config.h" #ifndef HAVE_ASPRINTF #include "compat/asprintf.h" #endif diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c index a16b1de3..08a2ae48 100644 --- a/varnish-cache/bin/varnishd/storage_file.c +++ b/varnish-cache/bin/varnishd/storage_file.c @@ -38,7 +38,6 @@ #include #include -#include "config.h" #ifdef HAVE_SYS_MOUNT_H #include #endif diff --git a/varnish-cache/bin/varnishhist/varnishhist.c b/varnish-cache/bin/varnishhist/varnishhist.c index 94036b36..49bc3470 100644 --- a/varnish-cache/bin/varnishhist/varnishhist.c +++ b/varnish-cache/bin/varnishhist/varnishhist.c @@ -46,7 +46,6 @@ #include #include -#include "config.h" #include "libvarnish.h" #include "shmlog.h" #include "varnishapi.h" diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c index f7c6227a..38fdfc42 100644 --- a/varnish-cache/bin/varnishlog/varnishlog.c +++ b/varnish-cache/bin/varnishlog/varnishlog.c @@ -43,7 +43,6 @@ #include #include -#include "config.h" #ifndef HAVE_DAEMON #include "compat/daemon.h" #endif diff --git a/varnish-cache/bin/varnishncsa/varnishncsa.c b/varnish-cache/bin/varnishncsa/varnishncsa.c index 517adb0f..33d640a9 100644 --- a/varnish-cache/bin/varnishncsa/varnishncsa.c +++ b/varnish-cache/bin/varnishncsa/varnishncsa.c @@ -71,7 +71,6 @@ #include #include -#include "config.h" #ifndef HAVE_DAEMON #include "compat/daemon.h" #endif diff --git a/varnish-cache/bin/varnishreplay/varnishreplay.c b/varnish-cache/bin/varnishreplay/varnishreplay.c index 1111eb39..ce7f592b 100644 --- a/varnish-cache/bin/varnishreplay/varnishreplay.c +++ b/varnish-cache/bin/varnishreplay/varnishreplay.c @@ -43,7 +43,6 @@ #include #include -#include "config.h" #include "vqueue.h" #include "libvarnish.h" diff --git a/varnish-cache/bin/varnishstat/varnishstat.c b/varnish-cache/bin/varnishstat/varnishstat.c index f2477d48..f9360c62 100644 --- a/varnish-cache/bin/varnishstat/varnishstat.c +++ b/varnish-cache/bin/varnishstat/varnishstat.c @@ -46,7 +46,6 @@ #include #include -#include "config.h" #include "libvarnish.h" #include "shmlog.h" #include "varnishapi.h" diff --git a/varnish-cache/bin/varnishtest/vtc.c b/varnish-cache/bin/varnishtest/vtc.c index 7109a6b5..c318b5e7 100644 --- a/varnish-cache/bin/varnishtest/vtc.c +++ b/varnish-cache/bin/varnishtest/vtc.c @@ -26,6 +26,8 @@ * $Id$ */ +#include "config.h" + #include #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_client.c b/varnish-cache/bin/varnishtest/vtc_client.c index 2668343c..00b13468 100644 --- a/varnish-cache/bin/varnishtest/vtc_client.c +++ b/varnish-cache/bin/varnishtest/vtc_client.c @@ -26,6 +26,8 @@ * $Id$ */ +#include "config.h" + #include #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_http.c b/varnish-cache/bin/varnishtest/vtc_http.c index 74341739..fb401a05 100644 --- a/varnish-cache/bin/varnishtest/vtc_http.c +++ b/varnish-cache/bin/varnishtest/vtc_http.c @@ -26,7 +26,10 @@ * $Id$ */ +#include "config.h" +#include +#include #include #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_log.c b/varnish-cache/bin/varnishtest/vtc_log.c index b7f8dabe..264c7860 100644 --- a/varnish-cache/bin/varnishtest/vtc_log.c +++ b/varnish-cache/bin/varnishtest/vtc_log.c @@ -26,6 +26,8 @@ * $Id$ */ +#include "config.h" + #include #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_sema.c b/varnish-cache/bin/varnishtest/vtc_sema.c index a5d70afa..ba1f53e4 100644 --- a/varnish-cache/bin/varnishtest/vtc_sema.c +++ b/varnish-cache/bin/varnishtest/vtc_sema.c @@ -26,6 +26,8 @@ * $Id$ */ +#include "config.h" + #include #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_server.c b/varnish-cache/bin/varnishtest/vtc_server.c index 0f128d97..f399f61f 100644 --- a/varnish-cache/bin/varnishtest/vtc_server.c +++ b/varnish-cache/bin/varnishtest/vtc_server.c @@ -26,6 +26,7 @@ * $Id$ */ +#include "config.h" #include #include diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c index c8ac4695..73019b03 100644 --- a/varnish-cache/bin/varnishtest/vtc_varnish.c +++ b/varnish-cache/bin/varnishtest/vtc_varnish.c @@ -26,6 +26,7 @@ * $Id$ */ +#include "config.h" #include diff --git a/varnish-cache/bin/varnishtop/varnishtop.c b/varnish-cache/bin/varnishtop/varnishtop.c index fe10ed21..f3d63e98 100644 --- a/varnish-cache/bin/varnishtop/varnishtop.c +++ b/varnish-cache/bin/varnishtop/varnishtop.c @@ -45,7 +45,6 @@ #include #include -#include "config.h" #include "vqueue.h" #include "vsb.h" diff --git a/varnish-cache/lib/libvarnish/argv.c b/varnish-cache/lib/libvarnish/argv.c index 83e1c323..c95b65c7 100644 --- a/varnish-cache/lib/libvarnish/argv.c +++ b/varnish-cache/lib/libvarnish/argv.c @@ -45,7 +45,6 @@ #include #include -#include "config.h" #include "libvarnish.h" static int diff --git a/varnish-cache/lib/libvarnish/assert.c b/varnish-cache/lib/libvarnish/assert.c index 4ec51079..28b3122e 100644 --- a/varnish-cache/lib/libvarnish/assert.c +++ b/varnish-cache/lib/libvarnish/assert.c @@ -37,7 +37,6 @@ #include #include -#include "config.h" #include "libvarnish.h" static void diff --git a/varnish-cache/lib/libvarnish/binary_heap.c b/varnish-cache/lib/libvarnish/binary_heap.c index 048e86a5..725f0fec 100644 --- a/varnish-cache/lib/libvarnish/binary_heap.c +++ b/varnish-cache/lib/libvarnish/binary_heap.c @@ -41,7 +41,6 @@ #include #include -#include "config.h" #include "binary_heap.h" #include "libvarnish.h" diff --git a/varnish-cache/lib/libvarnish/cli_common.c b/varnish-cache/lib/libvarnish/cli_common.c index 30bf511d..1af4d287 100644 --- a/varnish-cache/lib/libvarnish/cli_common.c +++ b/varnish-cache/lib/libvarnish/cli_common.c @@ -46,7 +46,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "libvarnish.h" diff --git a/varnish-cache/lib/libvarnish/flopen.c b/varnish-cache/lib/libvarnish/flopen.c index fe552f98..3f9c8661 100644 --- a/varnish-cache/lib/libvarnish/flopen.c +++ b/varnish-cache/lib/libvarnish/flopen.c @@ -39,7 +39,6 @@ #include #include -#include "config.h" #include "flopen.h" int diff --git a/varnish-cache/lib/libvarnish/time.c b/varnish-cache/lib/libvarnish/time.c index 37025649..0308a1ec 100644 --- a/varnish-cache/lib/libvarnish/time.c +++ b/varnish-cache/lib/libvarnish/time.c @@ -56,7 +56,6 @@ #include #include -#include "config.h" #include "libvarnish.h" double diff --git a/varnish-cache/lib/libvarnish/vct.c b/varnish-cache/lib/libvarnish/vct.c index add5bce7..b2c92109 100644 --- a/varnish-cache/lib/libvarnish/vct.c +++ b/varnish-cache/lib/libvarnish/vct.c @@ -30,6 +30,8 @@ * ctype(3) like functions, according to RFC2616 */ +#include "config.h" + #include /* NB: VCT always operate in ASCII, don't replace 0x0d with \r etc. */ diff --git a/varnish-cache/lib/libvarnish/version.c b/varnish-cache/lib/libvarnish/version.c index 51911469..2e34dd64 100644 --- a/varnish-cache/lib/libvarnish/version.c +++ b/varnish-cache/lib/libvarnish/version.c @@ -35,7 +35,6 @@ #include -#include "config.h" #include "libvarnish.h" void diff --git a/varnish-cache/lib/libvarnish/vlu.c b/varnish-cache/lib/libvarnish/vlu.c index 10937947..7a3925bb 100644 --- a/varnish-cache/lib/libvarnish/vlu.c +++ b/varnish-cache/lib/libvarnish/vlu.c @@ -29,6 +29,8 @@ * a function on each. */ +#include "config.h" + #include #include #include diff --git a/varnish-cache/lib/libvarnish/vpf.c b/varnish-cache/lib/libvarnish/vpf.c index 69543a9c..93ac13c1 100644 --- a/varnish-cache/lib/libvarnish/vpf.c +++ b/varnish-cache/lib/libvarnish/vpf.c @@ -41,7 +41,6 @@ #include #include -#include "config.h" #ifndef HAVE_STRLCPY #include "compat/strlcpy.h" #endif diff --git a/varnish-cache/lib/libvarnish/vss.c b/varnish-cache/lib/libvarnish/vss.c index 274289f5..511bed1c 100644 --- a/varnish-cache/lib/libvarnish/vss.c +++ b/varnish-cache/lib/libvarnish/vss.c @@ -44,7 +44,6 @@ #include #include -#include "config.h" #ifndef HAVE_STRLCPY #include "compat/strlcpy.h" #endif diff --git a/varnish-cache/lib/libvarnish/vtmpfile.c b/varnish-cache/lib/libvarnish/vtmpfile.c index 3cb69338..3e251485 100644 --- a/varnish-cache/lib/libvarnish/vtmpfile.c +++ b/varnish-cache/lib/libvarnish/vtmpfile.c @@ -36,7 +36,6 @@ #include #include -#include "config.h" #include "libvarnish.h" int diff --git a/varnish-cache/lib/libvarnishapi/base64.c b/varnish-cache/lib/libvarnishapi/base64.c index bd2d5361..4506ba48 100644 --- a/varnish-cache/lib/libvarnishapi/base64.c +++ b/varnish-cache/lib/libvarnishapi/base64.c @@ -10,7 +10,6 @@ #include #include -#include "config.h" #include "varnishapi.h" static const char *b64 = diff --git a/varnish-cache/lib/libvarnishapi/instance.c b/varnish-cache/lib/libvarnishapi/instance.c index 76df4408..5dc0ada2 100644 --- a/varnish-cache/lib/libvarnishapi/instance.c +++ b/varnish-cache/lib/libvarnishapi/instance.c @@ -34,7 +34,6 @@ #include #include -#include "config.h" #include "varnishapi.h" int diff --git a/varnish-cache/lib/libvarnishapi/shmlog.c b/varnish-cache/lib/libvarnishapi/shmlog.c index 673aa64c..3d9a1636 100644 --- a/varnish-cache/lib/libvarnishapi/shmlog.c +++ b/varnish-cache/lib/libvarnishapi/shmlog.c @@ -45,7 +45,6 @@ #include #include -#include "config.h" #include "shmlog.h" #include "miniobj.h" #include "varnishapi.h" diff --git a/varnish-cache/lib/libvcl/vcc_acl.c b/varnish-cache/lib/libvcl/vcc_acl.c index a440b5a0..dde8a8d0 100644 --- a/varnish-cache/lib/libvcl/vcc_acl.c +++ b/varnish-cache/lib/libvcl/vcc_acl.c @@ -41,7 +41,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "vrt.h" diff --git a/varnish-cache/lib/libvcl/vcc_action.c b/varnish-cache/lib/libvcl/vcc_action.c index 3385e5d6..fc42f9c1 100644 --- a/varnish-cache/lib/libvcl/vcc_action.c +++ b/varnish-cache/lib/libvcl/vcc_action.c @@ -33,7 +33,6 @@ #include -#include "config.h" #include "vsb.h" #include "vcc_priv.h" diff --git a/varnish-cache/lib/libvcl/vcc_backend.c b/varnish-cache/lib/libvcl/vcc_backend.c index c5edfc46..c86b41ce 100644 --- a/varnish-cache/lib/libvcl/vcc_backend.c +++ b/varnish-cache/lib/libvcl/vcc_backend.c @@ -60,7 +60,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "vcc_priv.h" diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c index 3ef118c0..000ba320 100644 --- a/varnish-cache/lib/libvcl/vcc_compile.c +++ b/varnish-cache/lib/libvcl/vcc_compile.c @@ -73,7 +73,6 @@ #include #include -#include "config.h" #include "vqueue.h" #include "vsb.h" diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c index f2d05a16..9f3a7904 100644 --- a/varnish-cache/lib/libvcl/vcc_fixed_token.c +++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c @@ -9,7 +9,6 @@ #include "config.h" #include #include -#include "config.h" #include "vcc_priv.h" #include "vsb.h" diff --git a/varnish-cache/lib/libvcl/vcc_parse.c b/varnish-cache/lib/libvcl/vcc_parse.c index 0cd36907..d1003412 100644 --- a/varnish-cache/lib/libvcl/vcc_parse.c +++ b/varnish-cache/lib/libvcl/vcc_parse.c @@ -34,7 +34,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "vcc_priv.h" diff --git a/varnish-cache/lib/libvcl/vcc_string.c b/varnish-cache/lib/libvcl/vcc_string.c index cd584f43..39b4b224 100644 --- a/varnish-cache/lib/libvcl/vcc_string.c +++ b/varnish-cache/lib/libvcl/vcc_string.c @@ -34,7 +34,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "vcc_priv.h" diff --git a/varnish-cache/lib/libvcl/vcc_token.c b/varnish-cache/lib/libvcl/vcc_token.c index c0ac0f94..76e1f528 100644 --- a/varnish-cache/lib/libvcl/vcc_token.c +++ b/varnish-cache/lib/libvcl/vcc_token.c @@ -36,7 +36,6 @@ #include #include -#include "config.h" #include "vqueue.h" #include "vsb.h" diff --git a/varnish-cache/lib/libvcl/vcc_var.c b/varnish-cache/lib/libvcl/vcc_var.c index 02d9c644..66a4f211 100644 --- a/varnish-cache/lib/libvcl/vcc_var.c +++ b/varnish-cache/lib/libvcl/vcc_var.c @@ -34,7 +34,6 @@ #include #include -#include "config.h" #include "vsb.h" #include "vcc_priv.h" diff --git a/varnish-cache/lib/libvcl/vcc_xref.c b/varnish-cache/lib/libvcl/vcc_xref.c index 51220a5b..6aa60267 100644 --- a/varnish-cache/lib/libvcl/vcc_xref.c +++ b/varnish-cache/lib/libvcl/vcc_xref.c @@ -43,7 +43,6 @@ #include -#include "config.h" #include "vsb.h" #include "libvarnish.h" -- 2.39.5