From b038cb7b2d21c677f34e10b52fa4ce8a8134da4c Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 20 Nov 2010 21:40:05 -0700 Subject: [PATCH] Policy enforcement: Remove config.h from .h and .cci files --- compat/GnuRegex.h | 4 ---- compat/assert.h | 5 ----- compat/compat.h | 4 ---- compat/compat_shared.h | 4 ---- compat/cpu.h | 5 ----- compat/debug.h | 4 ---- compat/drand48.h | 4 ---- compat/eui64_aton.h | 4 ---- compat/getaddrinfo.h | 4 ---- compat/getnameinfo.h | 4 ---- compat/inet_ntop.h | 4 ---- compat/inet_pton.h | 4 ---- compat/initgroups.h | 4 ---- compat/os/aix.h | 4 ---- compat/os/dragonfly.h | 4 ---- compat/os/freebsd.h | 4 ---- compat/os/hpux.h | 4 ---- compat/os/linux.h | 4 ---- compat/os/macosx.h | 4 ---- compat/os/mswin.h | 4 ---- compat/os/netbsd.h | 4 ---- compat/os/next.h | 4 ---- compat/os/openbsd.h | 4 ---- compat/os/os2.h | 4 ---- compat/os/qnx.h | 4 ---- compat/os/sgi.h | 4 ---- compat/os/solaris.h | 4 ---- compat/os/sunos.h | 4 ---- compat/os/windows.h | 4 ---- compat/psignal.h | 2 -- compat/stdvarargs.h | 4 ---- compat/strsep.h | 4 ---- compat/strtoll.h | 4 ---- compat/tempnam.h | 4 ---- compat/types.h | 4 ---- compat/unsafe.h | 4 ---- compat/valgrind.h | 4 ---- compat/xstrto.h | 2 -- helpers/digest_auth/LDAP/digest_common.h | 1 - helpers/digest_auth/eDirectory/digest_common.h | 1 - helpers/digest_auth/file/digest_common.h | 1 - include/MemPool.h | 1 - include/Range.h | 2 -- include/RefCount.h | 2 -- include/SquidNew.h | 2 -- include/asn1.h | 2 -- include/fatal.h | 2 -- include/getfullhostname.h | 2 -- include/hash.h | 2 -- include/heap.h | 3 --- include/md5.h | 2 -- include/memMeter.h | 2 -- include/radix.h | 2 -- include/rfc1035.h | 2 -- include/rfc2617.h | 2 -- include/rfc2671.h | 2 -- include/rfc3596.h | 2 -- include/snmp_api.h | 2 -- include/snmp_api_util.h | 2 +- include/snmp_debug.h | 2 -- include/snmp_msg.h | 2 -- include/snmp_pdu.h | 1 - include/snmp_session.h | 2 -- include/snmp_util.h | 2 -- include/squid_endian.h | 2 -- include/squid_windows.h | 2 -- include/strnstr.h | 2 -- include/util.h | 2 -- include/xusleep.h | 2 -- lib/ntlmauth/ntlmauth.h | 2 -- lib/profiler/get_tick.h | 2 -- lib/smblib/std-defines.h | 2 -- src/ChunkedCodingParser.h | 7 ------- src/ClientRequestContext.h | 1 - src/CommRead.h | 3 --- src/CommonPool.h | 3 --- src/CompositePoolNode.h | 3 --- src/CpuAffinity.h | 2 -- src/CpuAffinitySet.h | 1 - src/Debug.h | 2 -- src/DelayIdComposite.h | 3 --- src/DelayPool.h | 3 --- src/DelaySpec.h | 3 --- src/DelayTagged.h | 2 -- src/DelayUser.h | 2 -- src/DelayVector.h | 2 -- src/DiskIO/AIO/AIODiskFile.h | 2 -- src/DiskIO/AIO/AIODiskIOModule.h | 2 -- src/DiskIO/AIO/AIODiskIOStrategy.h | 2 -- src/DiskIO/AIO/aio_win32.h | 2 -- src/DiskIO/AIO/async_io.h | 2 -- src/DiskIO/DiskDaemon/DiskdIOStrategy.h | 2 -- src/DiskIO/DiskDaemon/diomsg.h | 2 -- src/DiskIO/DiskThreads/DiskThreads.h | 1 - src/HttpHdrContRange.h | 3 --- src/HttpHeaderMask.h | 3 --- src/HttpRequest.h | 2 -- src/HttpStatusLine.h | 3 --- src/LeakFinder.h | 2 -- src/Mem.h | 2 -- src/NullDelayId.h | 3 --- src/Packer.h | 3 --- src/PingData.h | 2 -- src/SquidString.h | 2 -- src/SquidTime.h | 1 - src/StoreMeta.h | 3 --- src/StoreMetaUnpacker.h | 3 --- src/String.cci | 1 - src/acl/Gadgets.h | 1 - src/adaptation/ecap/MessageRep.h | 1 - src/auth/Scheme.h | 1 - src/auth/User.cci | 2 -- src/base/InstanceId.h | 1 - src/base/TextException.h | 1 - src/base/TidyPointer.h | 2 -- src/comm/ListenStateData.h | 1 - src/dlink.h | 2 -- src/esi/ExpatParser.h | 2 -- src/esi/Libxml2Parser.h | 2 -- src/esi/Parser.h | 3 --- src/eui/Eui48.h | 2 -- src/eui/Eui64.h | 2 -- src/icmp/Icmp.h | 1 - src/icmp/Icmp4.h | 1 - src/icmp/Icmp6.h | 2 -- src/icmp/IcmpConfig.h | 2 -- src/icmp/IcmpPinger.h | 2 -- src/icmp/IcmpSquid.h | 1 - src/icmp/net_db.h | 2 -- src/ident/AclIdent.h | 2 -- src/ident/Config.h | 2 -- src/ident/Ident.h | 2 -- src/ip/Address.h | 2 -- src/ip/QosConfig.h | 1 - src/ipc/StartListening.h | 1 - src/ipc/TypedMsgHdr.h | 2 -- src/ipc/forward.h | 2 -- src/log/File.h | 1 - src/log/ModDaemon.h | 2 -- src/log/ModStdio.h | 2 -- src/log/ModSyslog.h | 2 -- src/log/ModTcp.h | 2 -- src/log/ModUdp.h | 2 -- src/ssl/Config.cc | 2 +- src/ssl/Config.h | 1 - src/ssl/context_storage.cc | 2 +- src/ssl/support.h | 1 - src/structs.h | 1 - src/tests/testAuth.h | 2 -- tools/purge/convert.cc | 2 +- 150 files changed, 4 insertions(+), 365 deletions(-) diff --git a/compat/GnuRegex.h b/compat/GnuRegex.h index 65631bc503..483c3a5855 100644 --- a/compat/GnuRegex.h +++ b/compat/GnuRegex.h @@ -1,10 +1,6 @@ /* * $Id$ */ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_REGEXP_LIBRARY_H #define SQUID_REGEXP_LIBRARY_H diff --git a/compat/assert.h b/compat/assert.h index 1bad0a026f..0953daf17b 100644 --- a/compat/assert.h +++ b/compat/assert.h @@ -30,11 +30,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_ASSERT_H #define SQUID_ASSERT_H diff --git a/compat/compat.h b/compat/compat.h index e0bc1db9b1..cb28156b48 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_COMPAT_H #define _SQUID_COMPAT_H diff --git a/compat/compat_shared.h b/compat/compat_shared.h index f5d00ee1ab..b4c1260f6a 100644 --- a/compat/compat_shared.h +++ b/compat/compat_shared.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_COMPAT_SHARED_H #define _SQUID_COMPAT_SHARED_H diff --git a/compat/cpu.h b/compat/cpu.h index cc5530c687..6f095397d3 100644 --- a/compat/cpu.h +++ b/compat/cpu.h @@ -1,11 +1,6 @@ /* * $Id$ */ - -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_COMPAT_CPU_H #define SQUID_COMPAT_CPU_H diff --git a/compat/debug.h b/compat/debug.h index 8c72fe1363..65cf7b09d0 100644 --- a/compat/debug.h +++ b/compat/debug.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef COMPAT_DEBUG_H #define COMPAT_DEBUG_H diff --git a/compat/drand48.h b/compat/drand48.h index 362d12448d..4e18900d05 100644 --- a/compat/drand48.h +++ b/compat/drand48.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_DRAND48_H #define _SQUID_DRAND48_H diff --git a/compat/eui64_aton.h b/compat/eui64_aton.h index 0d4bea365b..d4f5aade18 100644 --- a/compat/eui64_aton.h +++ b/compat/eui64_aton.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - /* If we have this system file use it. Otherwise use the below definitions. */ #if HAVE_SYS_EUI64_H #include diff --git a/compat/getaddrinfo.h b/compat/getaddrinfo.h index ea62a0114f..ba8ac2436e 100644 --- a/compat/getaddrinfo.h +++ b/compat/getaddrinfo.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _getaddrinfo_h #define _getaddrinfo_h diff --git a/compat/getnameinfo.h b/compat/getnameinfo.h index 0c1bba9a39..053294504f 100644 --- a/compat/getnameinfo.h +++ b/compat/getnameinfo.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _getnameinfo_h #define _getnameinfo_h /* diff --git a/compat/inet_ntop.h b/compat/inet_ntop.h index e9cbe4b6d1..9811f9ca22 100644 --- a/compat/inet_ntop.h +++ b/compat/inet_ntop.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _INC_INET_NTOP_H #define _INC_INET_NTOP_H diff --git a/compat/inet_pton.h b/compat/inet_pton.h index b80dc855be..2633bf5db0 100644 --- a/compat/inet_pton.h +++ b/compat/inet_pton.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _INC_INET_PTON_H #define _INC_INET_PTON_H diff --git a/compat/initgroups.h b/compat/initgroups.h index f67ff9a65e..49aa079f24 100644 --- a/compat/initgroups.h +++ b/compat/initgroups.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_INITGROUPS_H #define SQUID_INITGROUPS_H diff --git a/compat/os/aix.h b/compat/os/aix.h index be41cd5dc2..ac933ac294 100644 --- a/compat/os/aix.h +++ b/compat/os/aix.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_AIX_H #define SQUID_OS_AIX_H diff --git a/compat/os/dragonfly.h b/compat/os/dragonfly.h index a9071c0ee2..6fe742eb61 100644 --- a/compat/os/dragonfly.h +++ b/compat/os/dragonfly.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_DRAGONFLY_H #define SQUID_OS_DRAGONFLY_H diff --git a/compat/os/freebsd.h b/compat/os/freebsd.h index f63b6b3d7c..e8eff26c86 100644 --- a/compat/os/freebsd.h +++ b/compat/os/freebsd.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_FREEBSD_H #define SQUID_OS_FREEBSD_H diff --git a/compat/os/hpux.h b/compat/os/hpux.h index 25fdae1e64..9cdcd5cb32 100644 --- a/compat/os/hpux.h +++ b/compat/os/hpux.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_HPUX_H #define SQUID_OS_PHUX_H diff --git a/compat/os/linux.h b/compat/os/linux.h index 21f6663b4b..34ff1a404c 100644 --- a/compat/os/linux.h +++ b/compat/os/linux.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_LINUX_H #define SQUID_OS_LINUX_H diff --git a/compat/os/macosx.h b/compat/os/macosx.h index 4490e24402..41abbccdc9 100644 --- a/compat/os/macosx.h +++ b/compat/os/macosx.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_MACOSX_H #define SQUID_OS_MACOSX_H diff --git a/compat/os/mswin.h b/compat/os/mswin.h index d01f57c8a8..f59dd621d8 100644 --- a/compat/os/mswin.h +++ b/compat/os/mswin.h @@ -31,10 +31,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_MSWIN_H #define SQUID_OS_MSWIN_H diff --git a/compat/os/netbsd.h b/compat/os/netbsd.h index e47f158f6b..dd48070f2f 100644 --- a/compat/os/netbsd.h +++ b/compat/os/netbsd.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_NETBSD_H #define SQUID_OS_NETBSD_H diff --git a/compat/os/next.h b/compat/os/next.h index c023d95798..016188abbf 100644 --- a/compat/os/next.h +++ b/compat/os/next.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_NEXT_H #define SQUID_OS_NEXT_H diff --git a/compat/os/openbsd.h b/compat/os/openbsd.h index ed336b802b..5ba1e7bc4f 100644 --- a/compat/os/openbsd.h +++ b/compat/os/openbsd.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_OPENBSD_H #define SQUID_OS_OPENBSD_H diff --git a/compat/os/os2.h b/compat/os/os2.h index 92f99f1004..f957945bea 100644 --- a/compat/os/os2.h +++ b/compat/os/os2.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_OS2_H #define SQUID_OS_OS2_H diff --git a/compat/os/qnx.h b/compat/os/qnx.h index f1f49405b5..1c0d5e35ac 100644 --- a/compat/os/qnx.h +++ b/compat/os/qnx.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_QNX_H #define SQUID_OS_QNX_H diff --git a/compat/os/sgi.h b/compat/os/sgi.h index dc5bef703a..3e7c185f11 100644 --- a/compat/os/sgi.h +++ b/compat/os/sgi.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_SGI_H #define SQUID_OS_SGI_H diff --git a/compat/os/solaris.h b/compat/os/solaris.h index 14dce05a0a..c833615330 100644 --- a/compat/os/solaris.h +++ b/compat/os/solaris.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_SOLARIS_H #define SQUID_OS_SOLARIS_H diff --git a/compat/os/sunos.h b/compat/os/sunos.h index f1c67894b9..1f9a766d86 100644 --- a/compat/os/sunos.h +++ b/compat/os/sunos.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_SUNOS_H #define SQUID_OS_SUNOS_H diff --git a/compat/os/windows.h b/compat/os/windows.h index ad11de15c7..e49fd28c99 100644 --- a/compat/os/windows.h +++ b/compat/os/windows.h @@ -30,10 +30,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_OS_WINDOWS_H #define SQUID_OS_WINDOWS_H diff --git a/compat/psignal.h b/compat/psignal.h index 087df25c97..13538657fc 100644 --- a/compat/psignal.h +++ b/compat/psignal.h @@ -1,8 +1,6 @@ #ifndef __SQUID_PSIGNAL_H #define __SQUID_PSIGNAL_H -#include "config.h" - #if HAVE_SIGNAL_H #include #endif diff --git a/compat/stdvarargs.h b/compat/stdvarargs.h index c8c10f9cef..60b5bad990 100644 --- a/compat/stdvarargs.h +++ b/compat/stdvarargs.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_STDVARARGS_H #define _SQUID_STDVARARGS_H diff --git a/compat/strsep.h b/compat/strsep.h index d951bd858e..4181454b0f 100644 --- a/compat/strsep.h +++ b/compat/strsep.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - /* Copyright (C) 2004 Free Software Foundation, Inc. * Written by Yoann Vandoorselaere * diff --git a/compat/strtoll.h b/compat/strtoll.h index 7dd12b02ed..4f09ca46e1 100644 --- a/compat/strtoll.h +++ b/compat/strtoll.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_COMPAT_STRTOLL_H #define _SQUID_COMPAT_STRTOLL_H diff --git a/compat/tempnam.h b/compat/tempnam.h index ab1d4c29e3..d51bdf7a7b 100644 --- a/compat/tempnam.h +++ b/compat/tempnam.h @@ -17,10 +17,6 @@ * Cambridge, MA 02139, USA. */ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_TEMPNAM_H #define SQUID_TEMPNAM_H diff --git a/compat/types.h b/compat/types.h index 565328dc9c..5026a46107 100644 --- a/compat/types.h +++ b/compat/types.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - /* * * * * * * * * Legal stuff * * * * * * * * diff --git a/compat/unsafe.h b/compat/unsafe.h index 284607212d..d58f546a03 100644 --- a/compat/unsafe.h +++ b/compat/unsafe.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef _SQUID_COMPAT_UNSAFE_H #define _SQUID_COMPAT_UNSAFE_H diff --git a/compat/valgrind.h b/compat/valgrind.h index 737ee8f128..f6346155e7 100644 --- a/compat/valgrind.h +++ b/compat/valgrind.h @@ -1,7 +1,3 @@ -#ifndef SQUID_CONFIG_H -#include "config.h" -#endif - #ifndef SQUID_VALGRIND_H #define SQUID_VALGRIND_H diff --git a/compat/xstrto.h b/compat/xstrto.h index 7283659bf0..9dc9821070 100644 --- a/compat/xstrto.h +++ b/compat/xstrto.h @@ -1,8 +1,6 @@ #ifndef _SQUID_XSTRTO_H #define _SQUID_XSTRTO_H -#include "config.h" - #if HAVE_STDBOOL_H #include #endif diff --git a/helpers/digest_auth/LDAP/digest_common.h b/helpers/digest_auth/LDAP/digest_common.h index 1844bd783d..3f6fba38bf 100644 --- a/helpers/digest_auth/LDAP/digest_common.h +++ b/helpers/digest_auth/LDAP/digest_common.h @@ -11,7 +11,6 @@ #ifndef _SQUID_DIGEST_COMMON_H_ #define _SQUID_DIGEST_COMMON_H_ -#include "config.h" #if HAVE_STDIO_H #include #endif diff --git a/helpers/digest_auth/eDirectory/digest_common.h b/helpers/digest_auth/eDirectory/digest_common.h index 2f4a46ddcd..d403c2c3e0 100644 --- a/helpers/digest_auth/eDirectory/digest_common.h +++ b/helpers/digest_auth/eDirectory/digest_common.h @@ -11,7 +11,6 @@ #ifndef _SQUID_DIGEST_COMMON_H_ #define _SQUID_DIGEST_COMMON_H_ -#include "config.h" #if HAVE_STDIO_H #include #endif diff --git a/helpers/digest_auth/file/digest_common.h b/helpers/digest_auth/file/digest_common.h index bd9a952929..5c26bca6db 100644 --- a/helpers/digest_auth/file/digest_common.h +++ b/helpers/digest_auth/file/digest_common.h @@ -11,7 +11,6 @@ #ifndef _SQUID_DIGEST_COMMON_H_ #define _SQUID_DIGEST_COMMON_H_ -#include "config.h" #include "hash.h" #include "rfc2617.h" #include "util.h" diff --git a/include/MemPool.h b/include/MemPool.h index 8fe5be2d4b..126883267c 100644 --- a/include/MemPool.h +++ b/include/MemPool.h @@ -20,7 +20,6 @@ * might be the way to go. */ -#include "config.h" #include "util.h" #include "memMeter.h" diff --git a/include/Range.h b/include/Range.h index 7e89171dd2..7229729677 100644 --- a/include/Range.h +++ b/include/Range.h @@ -33,8 +33,6 @@ #ifndef SQUID_RANGE_H #define SQUID_RANGE_H -#include "config.h" - #if HAVE_IOSFWD #include #endif diff --git a/include/RefCount.h b/include/RefCount.h index 25253eb2fe..77ba37cac1 100644 --- a/include/RefCount.h +++ b/include/RefCount.h @@ -35,8 +35,6 @@ #ifndef _SQUID_REFCOUNT_H_ #define _SQUID_REFCOUNT_H_ -#include "config.h" - #if HAVE_IOSTREAM #include #endif diff --git a/include/SquidNew.h b/include/SquidNew.h index 74c92135c0..84054b716b 100644 --- a/include/SquidNew.h +++ b/include/SquidNew.h @@ -33,8 +33,6 @@ #ifndef SQUID_NEW_H #define SQUID_NEW_H -#include "config.h" - #ifndef __SUNPRO_CC /* Any code using libstdc++ must have externally resolvable overloads * for void * operator new - which means in the .o for the binary, diff --git a/include/asn1.h b/include/asn1.h index 9dd0684b86..c9e7138b25 100644 --- a/include/asn1.h +++ b/include/asn1.h @@ -1,8 +1,6 @@ #ifndef SQUID_SNMP_ASN1_H #define SQUID_SNMP_ASN1_H -#include "config.h" - /* * Definitions for Abstract Syntax Notation One, ASN.1 * As defined in ISO/IS 8824 and ISO/IS 8825 diff --git a/include/fatal.h b/include/fatal.h index e0b2fee3fe..6a887308df 100644 --- a/include/fatal.h +++ b/include/fatal.h @@ -1,8 +1,6 @@ #ifndef SQUID_FATAL_H #define SQUID_FATAL_H -#include "config.h" - SQUIDCEXTERN void fatal(const char *message); SQUIDCEXTERN void fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1; SQUIDCEXTERN void fatal_dump(const char *message); diff --git a/include/getfullhostname.h b/include/getfullhostname.h index 2099980df7..64f8ac9f9d 100644 --- a/include/getfullhostname.h +++ b/include/getfullhostname.h @@ -4,8 +4,6 @@ #ifndef _SQUID_GETFULLHOSTNAME_H #define _SQUID_GETFULLHOSTNAME_H -#include "config.h" - SQUIDCEXTERN const char *getfullhostname(void); #endif /* _SQUID_GETFULLHOSTNAME_H */ diff --git a/include/hash.h b/include/hash.h index 19ad3a5a69..3ac7838b89 100644 --- a/include/hash.h +++ b/include/hash.h @@ -4,8 +4,6 @@ #ifndef SQUID_HASH_H #define SQUID_HASH_H -#include "config.h" - typedef void HASHFREE(void *); typedef int HASHCMP(const void *, const void *); typedef unsigned int HASHHASH(const void *, unsigned int); diff --git a/include/heap.h b/include/heap.h index 41e65b1f81..ae0c8b10e1 100644 --- a/include/heap.h +++ b/include/heap.h @@ -43,9 +43,6 @@ #ifndef SQUID_HEAP_H #define SQUID_HEAP_H -/* Squid autoconf definitions */ -#include "config.h" - /* * Function for generating heap keys. The first argument will typically be * a dws_md_p passed in as a void *. Should find a way to get type safety diff --git a/include/md5.h b/include/md5.h index bd2ae36304..cedcbf1b43 100644 --- a/include/md5.h +++ b/include/md5.h @@ -1,8 +1,6 @@ #ifndef SQUID_MD5_H #define SQUID_MD5_H -#include "config.h" - /* * This is the header file for the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was diff --git a/include/memMeter.h b/include/memMeter.h index 1550ab5a72..4d684b5e55 100644 --- a/include/memMeter.h +++ b/include/memMeter.h @@ -4,8 +4,6 @@ #ifndef _MEM_METER_H_ #define _MEM_METER_H_ -#include "config.h" - /* object to track per-action memory usage (e.g. #idle objects) */ class MemMeter { diff --git a/include/radix.h b/include/radix.h index 497078ce06..aafc3e90c2 100644 --- a/include/radix.h +++ b/include/radix.h @@ -4,8 +4,6 @@ #ifndef SQUID_RADIX_H #define SQUID_RADIX_H -#include "config.h" - /* * Copyright (c) 1988, 1989, 1993 * The Regents of the University of California. All rights reserved. diff --git a/include/rfc1035.h b/include/rfc1035.h index e922c15d38..a8b71a12f0 100644 --- a/include/rfc1035.h +++ b/include/rfc1035.h @@ -33,8 +33,6 @@ #ifndef SQUID_RFC1035_H #define SQUID_RFC1035_H -#include "config.h" - #if HAVE_SYS_TYPES_H #include #endif diff --git a/include/rfc2617.h b/include/rfc2617.h index dd704faa2e..49e71e9144 100644 --- a/include/rfc2617.h +++ b/include/rfc2617.h @@ -49,8 +49,6 @@ #ifndef SQUID_RFC2617_H #define SQUID_RFC2617_H -#include "config.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/include/rfc2671.h b/include/rfc2671.h index de25eef78e..0f9f6e538b 100644 --- a/include/rfc2671.h +++ b/include/rfc2671.h @@ -38,8 +38,6 @@ #ifndef SQUID_RFC2671_H #define SQUID_RFC2671_H -#include "config.h" - /* RFC2671 section 7 defines new RR type OPT as 41 */ #define RFC1035_TYPE_OPT 41 diff --git a/include/rfc3596.h b/include/rfc3596.h index 1379bf6bdd..10ccd288ff 100644 --- a/include/rfc3596.h +++ b/include/rfc3596.h @@ -38,8 +38,6 @@ #ifndef SQUID_RFC3596_H #define SQUID_RFC3596_H -#include "config.h" - /* RFC 3596 extends RFC 1035 */ #include "rfc1035.h" diff --git a/include/snmp_api.h b/include/snmp_api.h index da69dbfd9e..573ea8d7e1 100644 --- a/include/snmp_api.h +++ b/include/snmp_api.h @@ -1,8 +1,6 @@ #ifndef SQUID_SNMP_API_H #define SQUID_SNMP_API_H -#include "config.h" - /*********************************************************** Copyright 1989 by Carnegie Mellon University diff --git a/include/snmp_api_util.h b/include/snmp_api_util.h index 40a7a99d97..0f012179b2 100644 --- a/include/snmp_api_util.h +++ b/include/snmp_api_util.h @@ -4,7 +4,7 @@ #ifndef SQUID_SNMP_API_UTIL_H #define SQUID_SNMP_API_UTIL_H -/* NP: required for typedef ipaddr and indirect config.h */ +/* NP: required for typedef ipaddr */ #include "snmp_pdu.h" /*********************************************************** diff --git a/include/snmp_debug.h b/include/snmp_debug.h index 1e88785d8e..d82bb6eadf 100644 --- a/include/snmp_debug.h +++ b/include/snmp_debug.h @@ -4,8 +4,6 @@ #ifndef SQUID_SNMP_DEBUG_H #define SQUID_SNMP_DEBUG_H -#include "config.h" - SQUIDCEXTERN void snmplib_debug(int, const char *,...) PRINTF_FORMAT_ARG2; #endif /* SQUID_SNMP_DEBUG_H */ diff --git a/include/snmp_msg.h b/include/snmp_msg.h index b2ba6a783a..414d18f522 100644 --- a/include/snmp_msg.h +++ b/include/snmp_msg.h @@ -2,8 +2,6 @@ #ifndef SQUID_SNMP_MSG_H #define SQUID_SNMP_MSG_H -#include "config.h" - /********************************************************************** * * Copyright 1997 by Carnegie Mellon University diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h index c5b2179e17..5048e8fe10 100644 --- a/include/snmp_pdu.h +++ b/include/snmp_pdu.h @@ -1,7 +1,6 @@ #ifndef SQUID_SNMP_PDU_H #define SQUID_SNMP_PDU_H -#include "config.h" /* required for oid typedef */ #include "asn1.h" diff --git a/include/snmp_session.h b/include/snmp_session.h index f46e455b1d..c5f6406760 100644 --- a/include/snmp_session.h +++ b/include/snmp_session.h @@ -2,8 +2,6 @@ #ifndef SQUID_SNMP_SESSION_H #define SQUID_SNMP_SESSION_H -#include "config.h" - /********************************************************************** * * Copyright 1997 by Carnegie Mellon University diff --git a/include/snmp_util.h b/include/snmp_util.h index c733420b8c..f03f4535a2 100644 --- a/include/snmp_util.h +++ b/include/snmp_util.h @@ -4,8 +4,6 @@ #ifndef SQUID_SNMP_UTIL_H #define SQUID_SNMP_UTIL_H -#include "config.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/include/squid_endian.h b/include/squid_endian.h index 54e0f9a6b8..74040330f8 100644 --- a/include/squid_endian.h +++ b/include/squid_endian.h @@ -55,8 +55,6 @@ * uint32_t le32toh(uint32_t); */ -#include "config.h" - /* * Some systems define bswap_16() and bswap_32() in * diff --git a/include/squid_windows.h b/include/squid_windows.h index 14c4959a18..5cf14de504 100644 --- a/include/squid_windows.h +++ b/include/squid_windows.h @@ -33,8 +33,6 @@ #ifndef _INC_SQUID_WINDOWS_H #define _INC_SQUID_WINDOWS_H -#include "config.h" - #ifdef _SQUID_WIN32_ #ifndef ACL diff --git a/include/strnstr.h b/include/strnstr.h index 63724a1997..41731606bd 100644 --- a/include/strnstr.h +++ b/include/strnstr.h @@ -1,5 +1,3 @@ -#include "config.h" - #if HAVE_STRNSTR /* Is strnstr exists and is usable we do so. */ diff --git a/include/util.h b/include/util.h index 300affb745..f3d1c40c5c 100644 --- a/include/util.h +++ b/include/util.h @@ -34,8 +34,6 @@ #ifndef SQUID_UTIL_H #define SQUID_UTIL_H -#include "config.h" - #if HAVE_STDIO_H #include #endif diff --git a/include/xusleep.h b/include/xusleep.h index 23d4c65341..32f9555144 100644 --- a/include/xusleep.h +++ b/include/xusleep.h @@ -4,8 +4,6 @@ #ifndef _INC_XUSLEEP_H #define _INC_XUSLEEP_H -#include "config.h" - SQUIDCEXTERN int xusleep(unsigned int); #endif /* _INC_XUSLEEP_H */ diff --git a/lib/ntlmauth/ntlmauth.h b/lib/ntlmauth/ntlmauth.h index 14ff8636e4..1f64866573 100644 --- a/lib/ntlmauth/ntlmauth.h +++ b/lib/ntlmauth/ntlmauth.h @@ -55,8 +55,6 @@ #ifndef SQUID_NTLMAUTH_H #define SQUID_NTLMAUTH_H -#include "config.h" - /* NP: All of this cruft is little endian */ #ifdef __cplusplus diff --git a/lib/profiler/get_tick.h b/lib/profiler/get_tick.h index e05e493de0..70f101380a 100644 --- a/lib/profiler/get_tick.h +++ b/lib/profiler/get_tick.h @@ -1,8 +1,6 @@ #ifndef _PROFILER_GET_TICK_H_ #define _PROFILER_GET_TICK_H_ -#include "config.h" - #if USE_XPROF_STATS #if !_SQUID_SOLARIS_ diff --git a/lib/smblib/std-defines.h b/lib/smblib/std-defines.h index 977ffbd84e..9cac7b1e33 100644 --- a/lib/smblib/std-defines.h +++ b/lib/smblib/std-defines.h @@ -1,8 +1,6 @@ #ifndef _SMBLIB_STD_DEFINES_H #define _SMBLIB_STD_DEFINES_H -#include "config.h" - /* RFCNB Standard includes ... */ /* diff --git a/src/ChunkedCodingParser.h b/src/ChunkedCodingParser.h index 3a3725bf1a..8b039c49e8 100644 --- a/src/ChunkedCodingParser.h +++ b/src/ChunkedCodingParser.h @@ -33,13 +33,6 @@ class MemBuf; -#if 0 -#include "RefCount.h" -#endif - -/* for size_t */ -#include "config.h" - /** \ingroup ChunkEncodingAPI Chunked Encoding API \par diff --git a/src/ClientRequestContext.h b/src/ClientRequestContext.h index 98acd4ec7a..f6b94a2d69 100644 --- a/src/ClientRequestContext.h +++ b/src/ClientRequestContext.h @@ -4,7 +4,6 @@ class ACLChecklist; class ClientHttpRequest; -#include "config.h" /* for RefCountable */ #include "RefCount.h" /* for CBDATA_CLASS() */ diff --git a/src/CommRead.h b/src/CommRead.h index 0d36677538..1c0f6fc335 100644 --- a/src/CommRead.h +++ b/src/CommRead.h @@ -33,9 +33,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef COMMREAD_H #define COMMREAD_H diff --git a/src/CommonPool.h b/src/CommonPool.h index fb24c43bde..8154578587 100644 --- a/src/CommonPool.h +++ b/src/CommonPool.h @@ -35,9 +35,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef COMMONPOOL_H #define COMMONPOOL_H #if DELAY_POOLS diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h index 904395de0b..89ad43b189 100644 --- a/src/CompositePoolNode.h +++ b/src/CompositePoolNode.h @@ -33,9 +33,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef COMPOSITEPOOLNODE_H #define COMPOSITEPOOLNODE_H diff --git a/src/CpuAffinity.h b/src/CpuAffinity.h index 0b6d39ab50..fdd89cf8f3 100644 --- a/src/CpuAffinity.h +++ b/src/CpuAffinity.h @@ -6,8 +6,6 @@ #ifndef SQUID_CPU_AFFINITY_H #define SQUID_CPU_AFFINITY_H -#include "config.h" - /// set CPU affinity for this process on startup SQUIDCEXTERN void CpuAffinityInit(); diff --git a/src/CpuAffinitySet.h b/src/CpuAffinitySet.h index cec1119287..c5890f47a1 100644 --- a/src/CpuAffinitySet.h +++ b/src/CpuAffinitySet.h @@ -6,7 +6,6 @@ #ifndef SQUID_CPU_AFFINITY_SET_H #define SQUID_CPU_AFFINITY_SET_H -#include "config.h" #include "compat/cpu.h" /// cpu affinity management for a single process diff --git a/src/Debug.h b/src/Debug.h index 484fe45945..6e5b90d412 100644 --- a/src/Debug.h +++ b/src/Debug.h @@ -34,8 +34,6 @@ #ifndef SQUID_DEBUG_H #define SQUID_DEBUG_H -#include "config.h" - #if HAVE_IOSTREAM #include #endif diff --git a/src/DelayIdComposite.h b/src/DelayIdComposite.h index 2c3bfe46e6..9f87e575cd 100644 --- a/src/DelayIdComposite.h +++ b/src/DelayIdComposite.h @@ -36,9 +36,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef DELAYIDCOMPOSITE_H #define DELAYIDCOMPOSITE_H #if DELAY_POOLS diff --git a/src/DelayPool.h b/src/DelayPool.h index f4f73edc0a..815ef32dca 100644 --- a/src/DelayPool.h +++ b/src/DelayPool.h @@ -36,9 +36,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef DELAYPOOL_H #define DELAYPOOL_H diff --git a/src/DelaySpec.h b/src/DelaySpec.h index a03d0c045e..8d4b67c2e4 100644 --- a/src/DelaySpec.h +++ b/src/DelaySpec.h @@ -32,9 +32,6 @@ #ifndef SQUID_DELAYSPEC_H #define SQUID_DELAYSPEC_H -/* for int64_t definition */ -#include "config.h" - class StoreEntry; /// \ingroup DelyPoolsAPI diff --git a/src/DelayTagged.h b/src/DelayTagged.h index b75994fca3..ad2ed7aa7c 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -36,8 +36,6 @@ #ifndef DELAYTAGGED_H #define DELAYTAGGED_H -#include "config.h" - #if DELAY_POOLS #include "squid.h" diff --git a/src/DelayUser.h b/src/DelayUser.h index 7c41f55e9b..6f37fa2618 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -36,8 +36,6 @@ #ifndef DELAYUSER_H #define DELAYUSER_H -#include "config.h" - #if DELAY_POOLS #include "squid.h" diff --git a/src/DelayVector.h b/src/DelayVector.h index 2eaf258cd4..7f1002dbe0 100644 --- a/src/DelayVector.h +++ b/src/DelayVector.h @@ -34,8 +34,6 @@ #ifndef SQUID_DELAYVECTOR_H #define SQUID_DELAYVECTOR_H -#include "config.h" - #if DELAY_POOLS #include "CompositePoolNode.h" diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h index 67d8ea76a6..1d5e9a195b 100644 --- a/src/DiskIO/AIO/AIODiskFile.h +++ b/src/DiskIO/AIO/AIODiskFile.h @@ -33,8 +33,6 @@ #ifndef SQUID_AIODISKFILE_H #define SQUID_AIODISKFILE_H -#include "config.h" - #if USE_DISKIO_AIO #include "DiskIO/DiskFile.h" diff --git a/src/DiskIO/AIO/AIODiskIOModule.h b/src/DiskIO/AIO/AIODiskIOModule.h index ded883fa77..ae98e6e854 100644 --- a/src/DiskIO/AIO/AIODiskIOModule.h +++ b/src/DiskIO/AIO/AIODiskIOModule.h @@ -33,8 +33,6 @@ #ifndef SQUID_AIODISKIOMODULE_H #define SQUID_AIODISKIOMODULE_H -#include "config.h" - #if USE_DISKIO_AIO #include "DiskIO/DiskIOModule.h" diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.h b/src/DiskIO/AIO/AIODiskIOStrategy.h index eeda90f172..9d461d0b7e 100644 --- a/src/DiskIO/AIO/AIODiskIOStrategy.h +++ b/src/DiskIO/AIO/AIODiskIOStrategy.h @@ -33,8 +33,6 @@ #ifndef SQUID_AIODISKIOSTRATEGY_H #define SQUID_AIODISKIOSTRATEGY_H -#include "config.h" - #if USE_DISKIO_AIO #include "DiskIO/DiskIOStrategy.h" diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h index 9bb5f4e6fe..28f5df80be 100644 --- a/src/DiskIO/AIO/aio_win32.h +++ b/src/DiskIO/AIO/aio_win32.h @@ -34,8 +34,6 @@ #ifndef __WIN32_AIO_H__ #define __WIN32_AIO_H__ -#include "config.h" - #if USE_DISKIO_AIO #ifdef _SQUID_CYGWIN_ diff --git a/src/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h index 24757800c8..94626a1fdf 100644 --- a/src/DiskIO/AIO/async_io.h +++ b/src/DiskIO/AIO/async_io.h @@ -1,8 +1,6 @@ #ifndef __ASYNC_IO_H__ #define __ASYNC_IO_H__ -#include "config.h" - #if USE_DISKIO_AIO #ifdef _SQUID_WIN32_ diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h index 6bc70e9241..161d7edde7 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h @@ -36,8 +36,6 @@ #ifndef __STORE_DISKDIOSTRATEGY_H__ #define __STORE_DISKDIOSTRATEGY_H__ -#include "config.h" - struct diomsg; /// \ingroup diskd diff --git a/src/DiskIO/DiskDaemon/diomsg.h b/src/DiskIO/DiskDaemon/diomsg.h index 5827fdbbd7..5f735b3d42 100644 --- a/src/DiskIO/DiskDaemon/diomsg.h +++ b/src/DiskIO/DiskDaemon/diomsg.h @@ -7,8 +7,6 @@ #ifndef __SQUID_DIOMSG_H__ #define __SQUID_DIOMSG_H__ -#include "config.h" - enum { _MQD_NOP, _MQD_OPEN, diff --git a/src/DiskIO/DiskThreads/DiskThreads.h b/src/DiskIO/DiskThreads/DiskThreads.h index 15210ec97b..9b1fbd71e8 100644 --- a/src/DiskIO/DiskThreads/DiskThreads.h +++ b/src/DiskIO/DiskThreads/DiskThreads.h @@ -7,7 +7,6 @@ #ifndef __DISKTHREADS_H__ #define __DISKTHREADS_H__ -#include "config.h" #include "dlink.h" #include "typedefs.h" diff --git a/src/HttpHdrContRange.h b/src/HttpHdrContRange.h index 64ea4b1da7..58dc4e434f 100644 --- a/src/HttpHdrContRange.h +++ b/src/HttpHdrContRange.h @@ -34,9 +34,6 @@ class HttpHeader; -/* for SQUIDCEXTERN */ -#include "config.h" - /* for HttpHdrRangeSpec */ #include "HttpHeaderRange.h" diff --git a/src/HttpHeaderMask.h b/src/HttpHeaderMask.h index 5d05253fa5..cefb9423f4 100644 --- a/src/HttpHeaderMask.h +++ b/src/HttpHeaderMask.h @@ -32,9 +32,6 @@ #ifndef SQUID_HTTPHEADERMASK_H #define SQUID_HTTPHEADERMASK_H -/* for SQUIDCEXTERN */ -#include "config.h" - /* big mask for http headers */ typedef char HttpHeaderMask[12]; diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 7d34c93f46..afa1226101 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -33,8 +33,6 @@ #ifndef SQUID_HTTPREQUEST_H #define SQUID_HTTPREQUEST_H -#include "config.h" - #if USE_ADAPTATION #include "adaptation/History.h" #endif diff --git a/src/HttpStatusLine.h b/src/HttpStatusLine.h index 6d969fe0d0..d5dcb78148 100644 --- a/src/HttpStatusLine.h +++ b/src/HttpStatusLine.h @@ -36,9 +36,6 @@ class Packer; class String; -/* for SQUIDCEXTERN */ -#include "config.h" - /* for http_status and protocol_t */ #include "enums.h" diff --git a/src/LeakFinder.h b/src/LeakFinder.h index 7d0fc25d66..af74ea071a 100644 --- a/src/LeakFinder.h +++ b/src/LeakFinder.h @@ -1,8 +1,6 @@ #ifndef SQUID_LEAKFINDER_H #define SQUID_LEAKFINDER_H -#include "config.h" - #if USE_LEAKFINDER #include "hash.h" diff --git a/src/Mem.h b/src/Mem.h index 951db4e709..1c8d0d96e7 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -34,8 +34,6 @@ #ifndef SQUID_MEM #define SQUID_MEM -#include "config.h" - #if HAVE_OSTREAM #include #endif diff --git a/src/NullDelayId.h b/src/NullDelayId.h index 290e7d2916..f52c7ec165 100644 --- a/src/NullDelayId.h +++ b/src/NullDelayId.h @@ -36,9 +36,6 @@ * * Copyright (c) 2003, Robert Collins */ - -#include "config.h" - #ifndef NULLDELAYID_H #define NULLDELAYID_H #if DELAY_POOLS diff --git a/src/Packer.h b/src/Packer.h index 2830070f91..761cc99d93 100644 --- a/src/Packer.h +++ b/src/Packer.h @@ -32,9 +32,6 @@ #ifndef SQUID_PACKER_H #define SQUID_PACKER_H -/* for SQUIDCEXTERN */ -#include "config.h" - /* see Packer.cc for description */ class Packer; diff --git a/src/PingData.h b/src/PingData.h index 50caacf011..6a9010763f 100644 --- a/src/PingData.h +++ b/src/PingData.h @@ -33,8 +33,6 @@ #ifndef SQUID_PINGDATA_H #define SQUID_PINGDATA_H -#include "config.h" - class ping_data { diff --git a/src/SquidString.h b/src/SquidString.h index bf947e2d0d..76adafd85d 100644 --- a/src/SquidString.h +++ b/src/SquidString.h @@ -35,8 +35,6 @@ #ifndef SQUID_STRING_H #define SQUID_STRING_H -#include "config.h" - #if HAVE_OSTREAM #include #endif diff --git a/src/SquidTime.h b/src/SquidTime.h index 4decb63abe..47bd9533f1 100644 --- a/src/SquidTime.h +++ b/src/SquidTime.h @@ -32,7 +32,6 @@ #ifndef SQUID_TIME_H #define SQUID_TIME_H -#include "config.h" #include "rfc1123.h" #if HAVE_TIME_H diff --git a/src/StoreMeta.h b/src/StoreMeta.h index ffe12aea19..0cecba927e 100644 --- a/src/StoreMeta.h +++ b/src/StoreMeta.h @@ -37,9 +37,6 @@ class StoreEntry; // WTF? typedef class StoreMeta tlv; -/* for size_t, SQUIDCEXTERN */ -#include "config.h" - /** \ingroup SwapStoreAPI \todo AYJ: for critical lists like this we should use A=64,B=65 etc to enforce and reserve values. diff --git a/src/StoreMetaUnpacker.h b/src/StoreMetaUnpacker.h index 04f1d61ce8..7bc64fab8f 100644 --- a/src/StoreMetaUnpacker.h +++ b/src/StoreMetaUnpacker.h @@ -35,9 +35,6 @@ class StoreMeta; class StoreEntry; -/* for ssize_t, SQUIDCEXTERN */ -#include "config.h" - class StoreMetaUnpacker { diff --git a/src/String.cci b/src/String.cci index 4dd09556a8..abe17e5184 100644 --- a/src/String.cci +++ b/src/String.cci @@ -32,7 +32,6 @@ * */ -#include "config.h" #include #if HAVE_STDINT_H diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h index f6a8956c8b..deef46b8b6 100644 --- a/src/acl/Gadgets.h +++ b/src/acl/Gadgets.h @@ -1,7 +1,6 @@ #ifndef SQUID_ACL_GADGETS_H #define SQUID_ACL_GADGETS_H -#include "config.h" #include "err_type.h" struct dlink_list; diff --git a/src/adaptation/ecap/MessageRep.h b/src/adaptation/ecap/MessageRep.h index ba641937b5..6b753d7c96 100644 --- a/src/adaptation/ecap/MessageRep.h +++ b/src/adaptation/ecap/MessageRep.h @@ -6,7 +6,6 @@ #ifndef SQUID__ECAP__MESSAGE_REP_H #define SQUID__ECAP__MESSAGE_REP_H -#include "config.h" #include "HttpHeader.h" #include "BodyPipe.h" #include "adaptation/forward.h" diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h index 12370ed4af..0c3d65103f 100644 --- a/src/auth/Scheme.h +++ b/src/auth/Scheme.h @@ -33,7 +33,6 @@ #ifndef SQUID_AUTHSCHEME_H #define SQUID_AUTHSCHEME_H -#include "config.h" #include "Array.h" #include "RefCount.h" diff --git a/src/auth/User.cci b/src/auth/User.cci index 865e6fc08a..d8056bfafc 100644 --- a/src/auth/User.cci +++ b/src/auth/User.cci @@ -33,8 +33,6 @@ * Copyright (c) 2003, Robert Collins */ -#include "config.h" - char const * AuthUser::username () const { diff --git a/src/base/InstanceId.h b/src/base/InstanceId.h index db88c54d00..212c7f4f66 100644 --- a/src/base/InstanceId.h +++ b/src/base/InstanceId.h @@ -1,7 +1,6 @@ #ifndef SQUID_BASE_INSTANCE_ID_H #define SQUID_BASE_INSTANCE_ID_H -#include "config.h" #include /** Identifier for class instances diff --git a/src/base/TextException.h b/src/base/TextException.h index b02c03d548..89f5168091 100644 --- a/src/base/TextException.h +++ b/src/base/TextException.h @@ -3,7 +3,6 @@ // Origin: xstd/TextException -#include "config.h" #include static unsigned int FileNameHashCached(const char *fname); diff --git a/src/base/TidyPointer.h b/src/base/TidyPointer.h index 54488744c4..d6621902b3 100644 --- a/src/base/TidyPointer.h +++ b/src/base/TidyPointer.h @@ -5,8 +5,6 @@ #ifndef SQUID_BASE_TIDYPOINTER_H #define SQUID_BASE_TIDYPOINTER_H -#include "config.h" - /** * A pointer that deletes the object it points to when the pointer's owner or * context is gone. Similar to std::auto_ptr but without confusing assignment diff --git a/src/comm/ListenStateData.h b/src/comm/ListenStateData.h index b8e3c9057b..d49e317d13 100644 --- a/src/comm/ListenStateData.h +++ b/src/comm/ListenStateData.h @@ -1,7 +1,6 @@ #ifndef SQUID_LISTENERSTATEDATA_H #define SQUID_LISTENERSTATEDATA_H -#include "config.h" #include "base/AsyncCall.h" #include "comm.h" #if HAVE_MAP diff --git a/src/dlink.h b/src/dlink.h index c8c8d05e47..0e2cf22d04 100644 --- a/src/dlink.h +++ b/src/dlink.h @@ -32,8 +32,6 @@ #ifndef SQUID_DLINK_H #define SQUID_DLINK_H -#include "config.h" - class dlink_node { diff --git a/src/esi/ExpatParser.h b/src/esi/ExpatParser.h index 76246d75fb..687f5f6f77 100644 --- a/src/esi/ExpatParser.h +++ b/src/esi/ExpatParser.h @@ -33,8 +33,6 @@ #ifndef SQUID_ESIEXPATPARSER_H #define SQUID_ESIEXPATPARSER_H -#include "config.h" - #if USE_SQUID_ESI && HAVE_LIBEXPAT #include "esi/Parser.h" diff --git a/src/esi/Libxml2Parser.h b/src/esi/Libxml2Parser.h index 1dd093983e..7bd6cee92a 100644 --- a/src/esi/Libxml2Parser.h +++ b/src/esi/Libxml2Parser.h @@ -40,8 +40,6 @@ #ifndef SQUID_ESILIBXML2PARSER_H #define SQUID_ESILIBXML2PARSER_H -#include "config.h" - #if USE_SQUID_ESI && HAVE_LIBXML2 #include "esi/Parser.h" diff --git a/src/esi/Parser.h b/src/esi/Parser.h index 13ac18d4f3..4bf6c28609 100644 --- a/src/esi/Parser.h +++ b/src/esi/Parser.h @@ -32,9 +32,6 @@ #ifndef SQUID_ESIPARSER_H #define SQUID_ESIPARSER_H -/* for size_t */ -#include "config.h" - class ESIParserClient { public: diff --git a/src/eui/Eui48.h b/src/eui/Eui48.h index 023a985a4c..b0101a150c 100644 --- a/src/eui/Eui48.h +++ b/src/eui/Eui48.h @@ -1,8 +1,6 @@ #ifndef _SQUID_EUI_EUI48_H #define _SQUID_EUI_EUI48_H -#include "config.h" - #if USE_SQUID_EUI /* EUI-48 is 6 bytes. */ diff --git a/src/eui/Eui64.h b/src/eui/Eui64.h index 5f9e56d3f6..7669684505 100644 --- a/src/eui/Eui64.h +++ b/src/eui/Eui64.h @@ -1,8 +1,6 @@ #ifndef _SQUID_EUI_EUI64_H #define _SQUID_EUI_EUI64_H -#include "config.h" - #if USE_SQUID_EUI namespace Ip diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h index 804d97ee7e..90c66885d1 100644 --- a/src/icmp/Icmp.h +++ b/src/icmp/Icmp.h @@ -32,7 +32,6 @@ #ifndef _INCLUDE_ICMP_H #define _INCLUDE_ICMP_H -#include "config.h" #include "ip/Address.h" #define PINGER_PAYLOAD_SZ 8192 diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h index e6e67cce85..daa34f3d3e 100644 --- a/src/icmp/Icmp4.h +++ b/src/icmp/Icmp4.h @@ -34,7 +34,6 @@ #ifndef _INCLUDE_ICMPV4_H #define _INCLUDE_ICMPV4_H -#include "config.h" #include "Icmp.h" #if HAVE_NETINET_IN_H diff --git a/src/icmp/Icmp6.h b/src/icmp/Icmp6.h index a7fc3fad39..bb8f20a2b2 100644 --- a/src/icmp/Icmp6.h +++ b/src/icmp/Icmp6.h @@ -32,8 +32,6 @@ #ifndef _INCLUDE_ICMPV6_H #define _INCLUDE_ICMPV6_H -#include "config.h" - #include "Icmp.h" #if HAVE_NETINET_IN_H diff --git a/src/icmp/IcmpConfig.h b/src/icmp/IcmpConfig.h index 71dc258f49..aafa77273a 100644 --- a/src/icmp/IcmpConfig.h +++ b/src/icmp/IcmpConfig.h @@ -37,8 +37,6 @@ #ifndef ICMPCONFIG_H #define ICMPCONFIG_H -#include "config.h" - /** * Squid pinger Configuration settings * diff --git a/src/icmp/IcmpPinger.h b/src/icmp/IcmpPinger.h index ef24feabe0..ce3bc2f6ea 100644 --- a/src/icmp/IcmpPinger.h +++ b/src/icmp/IcmpPinger.h @@ -33,8 +33,6 @@ */ #ifndef _INCLUDE_ICMPPINGER_H #define _INCLUDE_ICMPPINGER_H - -#include "config.h" #include "Icmp.h" /** diff --git a/src/icmp/IcmpSquid.h b/src/icmp/IcmpSquid.h index ac631eb074..78aaf455fd 100644 --- a/src/icmp/IcmpSquid.h +++ b/src/icmp/IcmpSquid.h @@ -32,7 +32,6 @@ #ifndef _INCLUDE_ICMPSQUID_H #define _INCLUDE_ICMPSQUID_H -#include "config.h" #include "Icmp.h" /** diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h index 97e1343b63..616cdbcf55 100644 --- a/src/icmp/net_db.h +++ b/src/icmp/net_db.h @@ -1,8 +1,6 @@ #ifndef ICMP_NET_DB_H #define ICMP_NET_DB_H -#include "config.h" - namespace Ip { class Address; diff --git a/src/ident/AclIdent.h b/src/ident/AclIdent.h index 5c4c54d993..9d6674e12b 100644 --- a/src/ident/AclIdent.h +++ b/src/ident/AclIdent.h @@ -35,8 +35,6 @@ #ifndef SQUID_IDENT_ACLIDENT_H #define SQUID_IDENT_ACLIDENT_H -#include "config.h" - #if USE_IDENT #include "acl/Checklist.h" diff --git a/src/ident/Config.h b/src/ident/Config.h index 5de6c93643..b9a1cc0170 100644 --- a/src/ident/Config.h +++ b/src/ident/Config.h @@ -1,8 +1,6 @@ #ifndef SQUID_IDENT_CONFIG_H #define SQUID_IDENT_CONFIG_H -#include "config.h" - #if USE_IDENT #include "acl/Acl.h" diff --git a/src/ident/Ident.h b/src/ident/Ident.h index 7253a4736d..0814a6e8af 100644 --- a/src/ident/Ident.h +++ b/src/ident/Ident.h @@ -9,8 +9,6 @@ \ingroup SquidComponents */ -#include "config.h" - #if USE_IDENT #include "cbdata.h" diff --git a/src/ip/Address.h b/src/ip/Address.h index 8fe0125afe..a1365ca1ec 100644 --- a/src/ip/Address.h +++ b/src/ip/Address.h @@ -36,8 +36,6 @@ #ifndef _SQUID_IP_IPADDRESS_H #define _SQUID_IP_IPADDRESS_H -#include "config.h" - #if HAVE_SYS_SOCKET_H #include #endif diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index 654cba36fd..1936474635 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -1,7 +1,6 @@ #ifndef SQUID_QOSCONFIG_H #define SQUID_QOSCONFIG_H -#include "config.h" #include "hier_code.h" #if HAVE_LIBNETFILTER_CONNTRACK_LIBNETFILTER_CONNTRACK_H diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h index 020a0d7363..99354133b4 100644 --- a/src/ipc/StartListening.h +++ b/src/ipc/StartListening.h @@ -8,7 +8,6 @@ #ifndef SQUID_IPC_START_LISTENING_H #define SQUID_IPC_START_LISTENING_H -#include "config.h" #include "ip/forward.h" #include "ipc/FdNotes.h" #include "base/AsyncCall.h" diff --git a/src/ipc/TypedMsgHdr.h b/src/ipc/TypedMsgHdr.h index f7155ace35..95afe00dd6 100644 --- a/src/ipc/TypedMsgHdr.h +++ b/src/ipc/TypedMsgHdr.h @@ -8,8 +8,6 @@ #ifndef SQUID_IPC_TYPED_MSG_HDR_H #define SQUID_IPC_TYPED_MSG_HDR_H -#include "config.h" - #if HAVE_SYS_SOCKET_H #include #endif diff --git a/src/ipc/forward.h b/src/ipc/forward.h index d5173075db..7325abb6bc 100644 --- a/src/ipc/forward.h +++ b/src/ipc/forward.h @@ -8,8 +8,6 @@ #ifndef SQUID_IPC_FORWARD_H #define SQUID_IPC_FORWARD_H -#include "config.h" - namespace Ipc { diff --git a/src/log/File.h b/src/log/File.h index 56b690e43e..8ceb238eb9 100644 --- a/src/log/File.h +++ b/src/log/File.h @@ -1,7 +1,6 @@ #ifndef SQUID_SRC_LOG_FILE_H #define SQUID_SRC_LOG_FILE_H -#include "config.h" #include "dlink.h" #if HAVE_SYS_PARAM_H diff --git a/src/log/ModDaemon.h b/src/log/ModDaemon.h index 583a1c2711..02971ec8de 100644 --- a/src/log/ModDaemon.h +++ b/src/log/ModDaemon.h @@ -32,8 +32,6 @@ #ifndef _SQUID_SRC_LOG_MODDAEMON_H #define _SQUID_SRC_LOG_MODDAEMON_H -#include "config.h" - class Logfile; extern int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); diff --git a/src/log/ModStdio.h b/src/log/ModStdio.h index ca41dbd13b..79b41acb30 100644 --- a/src/log/ModStdio.h +++ b/src/log/ModStdio.h @@ -34,8 +34,6 @@ #ifndef _SQUID_SRC_LOG_MODSTDIO_H #define _SQUID_SRC_LOG_MODSTDIO_H -#include "config.h" - class Logfile; extern int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); diff --git a/src/log/ModSyslog.h b/src/log/ModSyslog.h index d31c0a4a8c..69e0d3b4e1 100644 --- a/src/log/ModSyslog.h +++ b/src/log/ModSyslog.h @@ -34,8 +34,6 @@ #ifndef _SQUID_SRC_LOG_MODSYSLOG_H #define _SQUID_SRC_LOG_MODSYSLOG_H -#include "config.h" - class Logfile; extern int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); diff --git a/src/log/ModTcp.h b/src/log/ModTcp.h index 4e8cd788cb..78acf101de 100644 --- a/src/log/ModTcp.h +++ b/src/log/ModTcp.h @@ -35,8 +35,6 @@ #ifndef _SQUID_SRC_LOG_MODTCP_H #define _SQUID_SRC_LOG_MODTCP_H -#include "config.h" - class Logfile; extern int logfile_mod_tcp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); diff --git a/src/log/ModUdp.h b/src/log/ModUdp.h index 08b5866ebb..b04b8e21ef 100644 --- a/src/log/ModUdp.h +++ b/src/log/ModUdp.h @@ -34,8 +34,6 @@ #ifndef _SQUID_SRC_LOG_MODUDP_H #define _SQUID_SRC_LOG_MODUDP_H -#include "config.h" - class Logfile; extern int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc index faf66eddde..301c6ebf85 100644 --- a/src/ssl/Config.cc +++ b/src/ssl/Config.cc @@ -1,7 +1,7 @@ /* * $Id$ */ - +#include "config.h" #include "ssl/Config.h" Ssl::Config Ssl::TheConfig; diff --git a/src/ssl/Config.h b/src/ssl/Config.h index 4d5f7f34f9..a475bd2f20 100644 --- a/src/ssl/Config.h +++ b/src/ssl/Config.h @@ -5,7 +5,6 @@ #ifndef SQUID_SSL_CONFIG_H #define SQUID_SSL_CONFIG_H -#include "config.h" #include "HelperChildConfig.h" namespace Ssl diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc index efcb3c70e8..bc02b47cf5 100644 --- a/src/ssl/context_storage.cc +++ b/src/ssl/context_storage.cc @@ -1,7 +1,7 @@ /* * $Id$ */ - +#include "config.h" #include "Store.h" #include "StoreEntryStream.h" #include "ssl/context_storage.h" diff --git a/src/ssl/support.h b/src/ssl/support.h index e0a45fdfc1..84bdaa661f 100644 --- a/src/ssl/support.h +++ b/src/ssl/support.h @@ -35,7 +35,6 @@ #ifndef SQUID_SSL_SUPPORT_H #define SQUID_SSL_SUPPORT_H -#include "config.h" #include "ssl/gadgets.h" #if HAVE_OPENSSL_SSL_H diff --git a/src/structs.h b/src/structs.h index 80e9563658..633e4233c0 100644 --- a/src/structs.h +++ b/src/structs.h @@ -29,7 +29,6 @@ #ifndef SQUID_STRUCTS_H #define SQUID_STRUCTS_H -#include "config.h" #include "RefCount.h" #include "cbdata.h" #include "dlink.h" diff --git a/src/tests/testAuth.h b/src/tests/testAuth.h index dfd442f483..b727884341 100644 --- a/src/tests/testAuth.h +++ b/src/tests/testAuth.h @@ -2,8 +2,6 @@ #ifndef SQUID_SRC_TEST_AUTH_H #define SQUID_SRC_TEST_AUTH_H -#include "config.h" - #include /* diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc index 590efa0c15..0b587fdff1 100644 --- a/tools/purge/convert.cc +++ b/tools/purge/convert.cc @@ -90,7 +90,7 @@ my_sock_ntoa( const struct sockaddr_in& a, SockAddress buffer ) { HostAddress host; snprintf( buffer, sizeof(SockAddress), "%s:%u", - my_inet_ntoa(a.sin_addr,host), ntohs(a.sin_port) ); + my_inet_ntoa(a.sin_addr,host), ntohs(a.sin_port) ); return buffer; } -- 2.47.2