------------------------------------------------------------ revno: 13292 revision-id: squid3@treenet.co.nz-20140221104619-jxevvwo3hmo0lzy3 parent: squid3@treenet.co.nz-20140221101021-3f53807mo6pzjmdo committer: Amos Jeffries branch nick: trunk timestamp: Fri 2014-02-21 03:46:19 -0700 message: Cleanup: un-wrap C++ header includes Coding guideline is now that standard C++ headers are not to be wrapped in HAVE_ macros. * Remove HAVE_ macros for currently wrapped C++ headers. Includes removing autoconf checks. * Replace C includes with C++ includes where possible Also, / has issues on 64-bit systems and a portable fixed version is provided by libcompat via squid.h It should not be included anywhere in the Squid sources. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140221104619-jxevvwo3hmo0lzy3 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 3dccef354134be05c26e2b7f290039a0ff4e1ea3 # timestamp: 2014-02-21 11:02:06 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140221101021-\ # 3f53807mo6pzjmdo # # Begin patch === modified file 'compat/compat_shared.h' --- compat/compat_shared.h 2013-10-25 00:13:46 +0000 +++ compat/compat_shared.h 2014-02-21 10:46:19 +0000 @@ -171,9 +171,13 @@ * Signalling flags are apparently not always provided. * TODO find out if these can be moved into specific OS portability files. */ +#if defined(__cplusplus) +#include +#else #if HAVE_SIGNAL_H #include #endif +#endif #ifndef SA_RESTART #define SA_RESTART 0 #endif === modified file 'compat/mswindows.cc' --- compat/mswindows.cc 2013-05-13 16:36:33 +0000 +++ compat/mswindows.cc 2014-02-21 10:46:19 +0000 @@ -41,10 +41,9 @@ #define sys_nerr _sys_nerr #undef assert -#include -#include +#include +#include #include -#include #include #if HAVE_WIN32_PSAPI #include === modified file 'compat/stdio.h' --- compat/stdio.h 2014-02-09 08:55:01 +0000 +++ compat/stdio.h 2014-02-21 10:46:19 +0000 @@ -15,7 +15,7 @@ // Import the stdio.h definitions first to do the state setup #if HAVE_STDIO_H -#include +#include #endif // Check for the buggy case @@ -46,7 +46,7 @@ #endif /* __USE_FILE_OFFSET64 && !__REDIRECT */ // Finally import the stuff we actually use -#if HAVE_CSTDIO && defined(__cplusplus) +#if defined(__cplusplus) #include #endif === modified file 'compat/stdvarargs.h' --- compat/stdvarargs.h 2011-11-04 07:03:11 +0000 +++ compat/stdvarargs.h 2014-02-21 10:46:19 +0000 @@ -6,7 +6,7 @@ * We provide a clean set of wrappers for the various operations * Depending on what is available and needed. */ -#if HAVE_CSTDARG && defined(__cplusplus) +#if defined(__cplusplus) #include #else @@ -18,7 +18,7 @@ #define VA_SHIFT(v,t) ; /* no-op for ANSI */ #define VA_END va_end(ap) -#else +#else /* !HAVE_STDARG_H */ #if HAVE_VARARGS_H #include #undef HAVE_STDARGS @@ -27,7 +27,7 @@ #define VA_SHIFT(v,t) v = va_arg(ap,t) #define VA_END va_end(ap) -#else +#else /* !HAVE_VARARGS_H*/ #error XX **NO VARARGS ** XX #endif /* HAVE_VARARGS_H */ #endif /* HAVE_STDARG_H */ === modified file 'compat/strnstr.cc' --- compat/strnstr.cc 2012-10-04 11:10:17 +0000 +++ compat/strnstr.cc 2014-02-21 10:46:19 +0000 @@ -59,9 +59,7 @@ #if HAVE_SYS_TYPES_H #include #endif -#if HAVE_STRING_H -#include -#endif +#include /** * Find the first occurrence of find in s, where the search is limited to the === modified file 'compat/testPreCompiler.cc' --- compat/testPreCompiler.cc 2012-01-20 18:55:04 +0000 +++ compat/testPreCompiler.cc 2014-02-21 10:46:19 +0000 @@ -1,9 +1,7 @@ #define SQUID_UNIT_TEST 1 #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif +#include #include "testPreCompiler.h" === modified file 'compat/xstrerror.cc' --- compat/xstrerror.cc 2012-07-02 12:14:07 +0000 +++ compat/xstrerror.cc 2014-02-21 10:46:19 +0000 @@ -1,9 +1,7 @@ #include "squid.h" #include "compat/xstrerror.h" -#if HAVE_STRING_H -#include -#endif +#include #if _SQUID_WINDOWS_ static struct _wsaerrtext { === modified file 'configure.ac' --- configure.ac 2014-02-20 13:03:07 +0000 +++ configure.ac 2014-02-21 10:46:19 +0000 @@ -2161,18 +2161,11 @@ AC_HEADER_STDC AC_CHECK_HEADERS( \ - algorithm \ arpa/inet.h \ arpa/nameser.h \ assert.h \ bstring.h \ - cassert \ crypt.h \ - cstdarg \ - cstdio \ - cstdlib \ - cstring \ - list \ ctype.h \ errno.h \ execinfo.h \ @@ -2182,11 +2175,6 @@ glob.h \ gnumalloc.h \ grp.h \ - iosfwd \ - iomanip \ - iostream \ - fstream \ - climits \ ip_compat.h \ ip_fil_compat.h \ ip_fil.h \ @@ -2195,16 +2183,13 @@ lber.h \ ldap.h \ libc.h \ - limits \ limits.h \ linux/posix_types.h \ linux/types.h \ machine/byte_swap.h \ malloc.h \ - map \ math.h \ memory.h \ - memory \ mount.h \ netdb.h \ netinet/in.h \ @@ -2218,7 +2203,6 @@ netinet/tcp.h \ openssl/engine.h \ openssl/txt_db.h \ - ostream \ paths.h \ poll.h \ pwd.h \ @@ -2227,14 +2211,11 @@ sched.h \ siginfo.h \ signal.h \ - sstream \ stdarg.h \ stdbool.h \ stddef.h \ - stdexcept \ stdio.h \ stdlib.h \ - string \ string.h \ strings.h \ sys/bitypes.h \ === modified file 'contrib/rredir.c' --- contrib/rredir.c 2012-01-20 18:55:04 +0000 +++ contrib/rredir.c 2014-02-21 10:46:19 +0000 @@ -35,7 +35,6 @@ * - initial version (Richard Huveneers ) */ -#include #include #include #include === modified file 'helpers/basic_auth/LDAP/basic_ldap_auth.cc' --- helpers/basic_auth/LDAP/basic_ldap_auth.cc 2012-10-08 05:21:11 +0000 +++ helpers/basic_auth/LDAP/basic_ldap_auth.cc 2014-02-21 10:46:19 +0000 @@ -89,9 +89,8 @@ #include "rfc1738.h" #include "util.h" -#include -#include -#include +#include +#include #if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_ #define snprintf _snprintf === modified file 'helpers/basic_auth/MSNT/allowusers.cc' --- helpers/basic_auth/MSNT/allowusers.cc 2013-10-25 00:13:46 +0000 +++ helpers/basic_auth/MSNT/allowusers.cc 2014-02-21 10:46:19 +0000 @@ -10,13 +10,14 @@ * The code originated from denyusers.c. */ -#include +#include "msntauth.h" +#include "usersfile.h" + +#include +#include #include #include #include -#include -#include "msntauth.h" -#include "usersfile.h" static usersfile AllowUsers; static int init = 0; === modified file 'helpers/basic_auth/MSNT/confload.cc' --- helpers/basic_auth/MSNT/confload.cc 2013-03-03 07:10:22 +0000 +++ helpers/basic_auth/MSNT/confload.cc 2014-02-21 10:46:19 +0000 @@ -13,14 +13,13 @@ /* Squid provides a number of portability overrides */ #include "squid.h" -#include -#include -#include +#include +#include +#include +#include #include -#include #include #include -#include #include "msntauth.h" #include "valid.h" === modified file 'helpers/basic_auth/MSNT/denyusers.cc' --- helpers/basic_auth/MSNT/denyusers.cc 2013-10-25 00:13:46 +0000 +++ helpers/basic_auth/MSNT/denyusers.cc 2014-02-21 10:46:19 +0000 @@ -9,15 +9,15 @@ * have been explicitly denied by the system administrator. * Routines at the bottom also use the allowed user functions. */ +#include "msntauth.h" +#include "usersfile.h" -#include +#include +#include +#include #include -#include #include #include -#include -#include "msntauth.h" -#include "usersfile.h" static usersfile DenyUsers; static int init = 0; === modified file 'helpers/basic_auth/MSNT/msntauth.cc' --- helpers/basic_auth/MSNT/msntauth.cc 2013-09-27 16:06:15 +0000 +++ helpers/basic_auth/MSNT/msntauth.cc 2014-02-21 10:46:19 +0000 @@ -33,10 +33,9 @@ #include "rfc1738.h" #include "util.h" -#include -#include +#include +#include #include -#include #include "msntauth.h" === modified file 'helpers/basic_auth/MSNT/usersfile.cc' --- helpers/basic_auth/MSNT/usersfile.cc 2012-11-13 11:51:19 +0000 +++ helpers/basic_auth/MSNT/usersfile.cc 2014-02-21 10:46:19 +0000 @@ -11,14 +11,13 @@ #include "squid.h" #include "util.h" -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include #include #include === modified file 'helpers/basic_auth/NCSA/basic_ncsa_auth.cc' --- helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2013-05-23 15:40:07 +0000 +++ helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2014-02-21 10:46:19 +0000 @@ -23,24 +23,17 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_SYS_STAT_H #include #endif #if HAVE_CRYPT_H #include #endif -#if HAVE_ERRNO_H -#include -#endif static hash_table *hash = NULL; static HASHFREE my_free; === modified file 'helpers/basic_auth/NCSA/crypt_md5.cc' --- helpers/basic_auth/NCSA/crypt_md5.cc 2013-10-25 00:13:46 +0000 +++ helpers/basic_auth/NCSA/crypt_md5.cc 2014-02-21 10:46:19 +0000 @@ -15,17 +15,11 @@ * */ #include "squid.h" - -#if HAVE_STRING_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif - #include "crypt_md5.h" #include "md5.h" +#include + static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; === modified file 'helpers/basic_auth/NIS/basic_nis_auth.cc' --- helpers/basic_auth/NIS/basic_nis_auth.cc 2012-01-20 18:55:04 +0000 +++ helpers/basic_auth/NIS/basic_nis_auth.cc 2014-02-21 10:46:19 +0000 @@ -9,18 +9,11 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_SYS_TYPES_H #include #endif === modified file 'helpers/basic_auth/NIS/nis_support.cc' --- helpers/basic_auth/NIS/nis_support.cc 2013-10-20 16:46:53 +0000 +++ helpers/basic_auth/NIS/nis_support.cc 2014-02-21 10:46:19 +0000 @@ -3,15 +3,8 @@ */ #include "squid.h" -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include #if HAVE_SYSLOG_H #include #endif === modified file 'helpers/basic_auth/PAM/basic_pam_auth.cc' --- helpers/basic_auth/PAM/basic_pam_auth.cc 2013-03-17 23:40:08 +0000 +++ helpers/basic_auth/PAM/basic_pam_auth.cc 2014-02-21 10:46:19 +0000 @@ -68,21 +68,10 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_ASSERT_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_SIGNAL_H -#include -#endif -#if HAVE_TIME_H -#include -#endif +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif === modified file 'helpers/basic_auth/RADIUS/basic_radius_auth.cc' --- helpers/basic_auth/RADIUS/basic_radius_auth.cc 2013-10-25 00:13:46 +0000 +++ helpers/basic_auth/RADIUS/basic_radius_auth.cc 2014-02-21 10:46:19 +0000 @@ -51,6 +51,10 @@ #include "radius-util.h" #include "radius.h" +#include +#include +#include +#include #if HAVE_SYS_SOCKET_H #include #endif @@ -66,12 +70,6 @@ #if _SQUID_WINDOWS_ #include #endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_UNISTD_H #include #endif @@ -81,18 +79,9 @@ #if HAVE_PWD_H #include #endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_STRING_H -#include -#endif #if HAVE_GETOPT_H #include #endif -#if HAVE_ERRNO_H -#include -#endif /* AYJ: helper input buffer may be a lot larger than this used to expect... */ #define MAXPWNAM 254 === modified file 'helpers/basic_auth/RADIUS/radius-util.cc' --- helpers/basic_auth/RADIUS/radius-util.cc 2012-07-19 13:49:54 +0000 +++ helpers/basic_auth/RADIUS/radius-util.cc 2014-02-21 10:46:19 +0000 @@ -37,35 +37,24 @@ " 2.1 Copyright 1997 Cistron Internet Services B.V."; #include "squid.h" +#include "md5.h" +#include "radius-util.h" +#include +#include +#include #if HAVE_SYS_SOCKET_H -#include +#include #endif #if HAVE_NETINET_IN_H -#include -#endif - -#if HAVE_STDIO_H -#include +#include #endif #if HAVE_NETDB_H -#include +#include #endif #if HAVE_PWD_H -#include -#endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_SIGNAL_H -#include -#endif - -#include "md5.h" -#include "radius-util.h" +#include +#endif /* * Check for valid IP address in standard dot notation. === modified file 'helpers/basic_auth/SASL/basic_sasl_auth.cc' --- helpers/basic_auth/SASL/basic_sasl_auth.cc 2012-09-01 14:38:36 +0000 +++ helpers/basic_auth/SASL/basic_sasl_auth.cc 2014-02-21 10:46:19 +0000 @@ -29,18 +29,9 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include +#include #if HAVE_SASL_SASL_H #include #else === modified file 'helpers/basic_auth/SMB/basic_smb_auth.cc' --- helpers/basic_auth/SMB/basic_smb_auth.cc 2012-11-14 01:10:42 +0000 +++ helpers/basic_auth/SMB/basic_smb_auth.cc 2014-02-21 10:46:19 +0000 @@ -45,12 +45,7 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include #define NMB_UNICAST 1 #define NMB_BROADCAST 2 === modified file 'helpers/basic_auth/SSPI/basic_sspi_auth.cc' --- helpers/basic_auth/SSPI/basic_sspi_auth.cc 2012-10-18 08:55:04 +0000 +++ helpers/basic_auth/SSPI/basic_sspi_auth.cc 2014-02-21 10:46:19 +0000 @@ -30,9 +30,6 @@ #include "util.h" #include "valid.h" -#if HAVE_STDIO_H -#include -#endif #if GETOPT_H #include #endif === modified file 'helpers/basic_auth/SSPI/valid.h' --- helpers/basic_auth/SSPI/valid.h 2012-10-18 08:55:04 +0000 +++ helpers/basic_auth/SSPI/valid.h 2014-02-21 10:46:19 +0000 @@ -61,7 +61,6 @@ /* Debugging stuff */ #if defined(__GNUC__) /* this is really a gcc-ism */ -#include #include static char *__foo; #define debug(X...) if (debug_enabled) { \ === modified file 'helpers/basic_auth/fake/fake.cc' --- helpers/basic_auth/fake/fake.cc 2012-01-20 18:55:04 +0000 +++ helpers/basic_auth/fake/fake.cc 2014-02-21 10:46:19 +0000 @@ -15,12 +15,7 @@ #include "squid.h" #include "helpers/defines.h" -#if HAVE_CSTRING #include -#endif -#if HAVE_STRING_H -#include -#endif /** * options: === modified file 'helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc' --- helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc 2012-01-20 18:55:04 +0000 +++ helpers/basic_auth/getpwnam/basic_getpwnam_auth.cc 2014-02-21 10:46:19 +0000 @@ -27,20 +27,12 @@ #include "squid.h" #include "helpers/defines.h" #include "rfc1738.h" -//#include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_CRYPT_H #include #endif === modified file 'helpers/digest_auth/LDAP/digest_common.h' --- helpers/digest_auth/LDAP/digest_common.h 2013-10-25 00:13:46 +0000 +++ helpers/digest_auth/LDAP/digest_common.h 2014-02-21 10:46:19 +0000 @@ -11,21 +11,12 @@ #ifndef SQUID_DIGEST_COMMON_H_ #define SQUID_DIGEST_COMMON_H_ -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif +#include +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_SYS_TYPES_H #include #endif === modified file 'helpers/digest_auth/eDirectory/digest_common.h' --- helpers/digest_auth/eDirectory/digest_common.h 2013-10-25 00:13:46 +0000 +++ helpers/digest_auth/eDirectory/digest_common.h 2014-02-21 10:46:19 +0000 @@ -11,21 +11,12 @@ #ifndef SQUID_DIGEST_COMMON_H_ #define SQUID_DIGEST_COMMON_H_ -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif +#include +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_STRINGS_H #include #endif === modified file 'helpers/digest_auth/file/digest_common.h' --- helpers/digest_auth/file/digest_common.h 2011-10-30 02:42:27 +0000 +++ helpers/digest_auth/file/digest_common.h 2014-02-21 10:46:19 +0000 @@ -15,15 +15,10 @@ #include "rfc2617.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_SYS_STAT_H #include #endif === modified file 'helpers/external_acl/AD_group/ext_ad_group_acl.cc' --- helpers/external_acl/AD_group/ext_ad_group_acl.cc 2014-02-08 13:36:42 +0000 +++ helpers/external_acl/AD_group/ext_ad_group_acl.cc 2014-02-21 10:46:19 +0000 @@ -66,20 +66,13 @@ int _wcsicmp(const wchar_t *, const wchar_t *); #endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#undef assert +#include +#include +#include #if HAVE_GETOPT_H #include #endif -#undef assert -#include #include #include #include === modified file 'helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc' --- helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2013-09-27 16:06:15 +0000 +++ helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2014-02-21 10:46:19 +0000 @@ -41,15 +41,8 @@ #define LDAP_DEPRECATED 1 -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif +#include +#include #if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_ === modified file 'helpers/external_acl/LM_group/ext_lm_group_acl.cc' --- helpers/external_acl/LM_group/ext_lm_group_acl.cc 2012-10-26 02:21:21 +0000 +++ helpers/external_acl/LM_group/ext_lm_group_acl.cc 2014-02-21 10:46:19 +0000 @@ -77,20 +77,13 @@ int _wcsicmp(const wchar_t *, const wchar_t *); #endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#undef assert +#include +#include +#include #if HAVE_GETOPT_H #include #endif -#undef assert -#include #include #include #include === modified file 'helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc' --- helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc 2013-03-11 00:30:26 +0000 +++ helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc 2014-02-21 10:46:19 +0000 @@ -35,30 +35,19 @@ #define EDUI_PROGRAM_VERSION "2.1" /* System includes */ -#ifdef HAVE_STDIO_H -#include -#endif #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif #ifndef __USE_GNU #define __USE_GNU #endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif -#ifdef HAVE_ERRNO_H -#include -#endif -#ifdef HAVE_SIGNAL_H -#include -#endif +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_ARPA_INET_H #include #endif @@ -69,12 +58,6 @@ #ifdef HAVE_LDAP_H #include #endif -#ifdef HAVE_STDARG_H -#include -#endif -#ifdef HAVE_TIME_H -#include -#endif #ifdef HELPER_INPUT_BUFFER #define EDUI_MAXLEN HELPER_INPUT_BUFFER === modified file 'helpers/external_acl/file_userip/ext_file_userip_acl.cc' --- helpers/external_acl/file_userip/ext_file_userip_acl.cc 2012-11-14 06:50:52 +0000 +++ helpers/external_acl/file_userip/ext_file_userip_acl.cc 2014-02-21 10:46:19 +0000 @@ -23,15 +23,8 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include #if HAVE_SYS_SOCKET_H #include #endif === modified file 'helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc' --- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc 2013-10-25 00:13:46 +0000 +++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc 2014-02-21 10:46:19 +0000 @@ -37,9 +37,7 @@ #ifdef HAVE_LDAP #include "support.h" -#ifdef HAVE_CTYPE_H -#include -#endif +#include void init_args(struct main_args *margs) @@ -420,8 +418,7 @@ } #else -#include -#include +#include int main(int argc, char *const argv[]) { === modified file 'helpers/external_acl/kerberos_ldap_group/support.h' --- helpers/external_acl/kerberos_ldap_group/support.h 2013-09-28 15:19:53 +0000 +++ helpers/external_acl/kerberos_ldap_group/support.h 2014-02-21 10:46:19 +0000 @@ -24,9 +24,7 @@ #define KERBEROS_LDAP_GROUP_VERSION "1.3.1sq" -#if HAVE_STRING_H -#include -#endif +#include #if HAVE_KRB5_H #if HAVE_BROKEN_SOLARIS_KRB5_H === modified file 'helpers/external_acl/kerberos_ldap_group/support_log.cc' --- helpers/external_acl/kerberos_ldap_group/support_log.cc 2013-09-27 15:21:54 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_log.cc 2014-02-21 10:46:19 +0000 @@ -27,9 +27,7 @@ #ifdef HAVE_LDAP #include "support.h" -#ifdef HAVE_TIME_H -#include -#endif +#include const char * LogTime() === modified file 'helpers/external_acl/session/ext_session_acl.cc' --- helpers/external_acl/session/ext_session_acl.cc 2012-01-20 18:55:04 +0000 +++ helpers/external_acl/session/ext_session_acl.cc 2014-02-21 10:46:19 +0000 @@ -23,6 +23,9 @@ #endif #include "helpers/defines.h" +#include +#include +#include #if HAVE_DB_H #include #endif @@ -30,12 +33,8 @@ #if HAVE_GETOPT_H #include #endif -#include -#include -#include #include #include -#include #if HAVE_UNISTD_H #include #endif === modified file 'helpers/external_acl/time_quota/ext_time_quota_acl.cc' --- helpers/external_acl/time_quota/ext_time_quota_acl.cc 2012-11-14 06:50:52 +0000 +++ helpers/external_acl/time_quota/ext_time_quota_acl.cc 2014-02-21 10:46:19 +0000 @@ -18,22 +18,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#if HAVE_CONFIG_H #include "squid.h" -#endif #include "helpers/defines.h" +#include +#include +#include +#include #include #include #include -#include -#include -#include #if HAVE_UNISTD_H #include #endif -#include -#include #if HAVE_GETOPT_H #include #endif === modified file 'helpers/external_acl/unix_group/check_group.cc' --- helpers/external_acl/unix_group/check_group.cc 2013-01-25 23:53:17 +0000 +++ helpers/external_acl/unix_group/check_group.cc 2014-02-21 10:46:19 +0000 @@ -58,12 +58,8 @@ #include "rfc1738.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include #if HAVE_GRP_H #include #endif @@ -73,9 +69,6 @@ #if HAVE_PWD_H #include #endif -#if HAVE_CTYPE_H -#include -#endif /* * Verify if user's primary group matches groupname === modified file 'helpers/log_daemon/file/log_file_daemon.cc' --- helpers/log_daemon/file/log_file_daemon.cc 2012-12-10 12:05:29 +0000 +++ helpers/log_daemon/file/log_file_daemon.cc 2014-02-21 10:46:19 +0000 @@ -1,32 +1,21 @@ #include "squid.h" -#if HAVE_STDIO_H -#include -#endif +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif #if HAVE_FCNTL_H #include #endif -#if HAVE_ASSERT_H -#include -#endif #if HAVE_SYS_PARAM_H #include #endif #if HAVE_SYS_STAT_H #include #endif -#if HAVE_SIGNAL_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif #if HAVE_PATHS_H #include #endif === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos.h' --- helpers/negotiate_auth/kerberos/negotiate_kerberos.h 2013-10-25 00:13:46 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h 2014-02-21 10:46:19 +0000 @@ -27,21 +27,14 @@ * ----------------------------------------------------------------------------- */ -#if HAVE_STRING_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif +#include +#include #if HAVE_NETDB_H #include #endif #if HAVE_UNISTD_H #include #endif -#if HAVE_TIME_H -#include -#endif #include "base64.h" #include "util.h" === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc' --- helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2013-10-25 00:13:46 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2014-02-21 10:46:19 +0000 @@ -492,8 +492,7 @@ } } #else -#include -#include +#include #ifndef MAX_AUTHTOKEN_LEN #define MAX_AUTHTOKEN_LEN 65535 #endif === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc' --- helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc 2013-09-27 15:21:54 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc 2014-02-21 10:46:19 +0000 @@ -29,24 +29,15 @@ #if HAVE_GSSAPI -#if HAVE_STRING_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif +#include +#include +#include #if HAVE_NETDB_H #include #endif #if HAVE_UNISTD_H #include #endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif #include "base64.h" #include "util.h" @@ -238,7 +229,7 @@ } #else -#include +#include int main(int argc, char *argv[]) { === modified file 'helpers/negotiate_auth/wrapper/negotiate_wrapper.cc' --- helpers/negotiate_auth/wrapper/negotiate_wrapper.cc 2013-09-27 16:06:15 +0000 +++ helpers/negotiate_auth/wrapper/negotiate_wrapper.cc 2014-02-21 10:46:19 +0000 @@ -28,27 +28,16 @@ #include "squid.h" #include "base64.h" -#if HAVE_STRING_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif +#include +#include +#include +#include #if HAVE_NETDB_H #include #endif #if HAVE_UNISTD_H #include #endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif #if !defined(HAVE_DECL_XMALLOC) || !HAVE_DECL_XMALLOC #define xmalloc malloc === modified file 'helpers/ntlm_auth/fake/ntlm_fake_auth.cc' --- helpers/ntlm_auth/fake/ntlm_fake_auth.cc 2013-10-08 01:11:04 +0000 +++ helpers/ntlm_auth/fake/ntlm_fake_auth.cc 2014-02-21 10:46:19 +0000 @@ -56,14 +56,9 @@ #include "helpers/defines.h" #include "ntlmauth/ntlmauth.h" #include "ntlmauth/support_bits.cci" -//#include "util.h" -#if HAVE_STRING_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif +#include +#include #if HAVE_CRYPT_H #include #endif @@ -73,9 +68,6 @@ #if HAVE_GETOPT_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_STDINT_H #include #endif === modified file 'helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc' --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc 2012-11-18 07:12:58 +0000 +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc 2014-02-21 10:46:19 +0000 @@ -20,41 +20,23 @@ #include "ntlmauth/support_bits.cci" #include "rfcnb/rfcnb.h" #include "smblib/smblib.h" -//#include "util.h" -#if HAVE_STRING_H -#include -#endif +#include +#include +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_SIGNAL_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif #if HAVE_GETOPT_H #include #endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif #if HAVE_UNISTD_H #include #endif -#if HAVE_ASSERT_H -#include -#endif -#if HAVE_TIME_H -#include -#endif /************* CONFIGURATION ***************/ === modified file 'helpers/url_rewrite/fake/fake.cc' --- helpers/url_rewrite/fake/fake.cc 2012-01-20 18:55:04 +0000 +++ helpers/url_rewrite/fake/fake.cc 2014-02-21 10:46:19 +0000 @@ -15,12 +15,7 @@ #include "squid.h" #include "helpers/defines.h" -#if HAVE_CSTRING #include -#endif -#if HAVE_STRING_H -#include -#endif /** * options: === modified file 'include/Range.h' --- include/Range.h 2012-09-03 08:58:40 +0000 +++ include/Range.h 2014-02-21 10:46:19 +0000 @@ -31,12 +31,8 @@ #ifndef SQUID_RANGE_H #define SQUID_RANGE_H -#if HAVE_IOSFWD #include -#endif -#if HAVE_OSTREAM #include -#endif /* represents [start, end) */ === modified file 'include/util.h' --- include/util.h 2012-10-09 09:23:00 +0000 +++ include/util.h 2014-02-21 10:46:19 +0000 @@ -32,9 +32,6 @@ #ifndef SQUID_UTIL_H #define SQUID_UTIL_H -#if HAVE_STDIO_H -#include -#endif #if HAVE_TIME_H #include #endif === modified file 'lib/MemPool.cc' --- lib/MemPool.cc 2013-01-14 05:01:04 +0000 +++ lib/MemPool.cc 2014-02-21 10:46:19 +0000 @@ -32,9 +32,8 @@ */ #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif + +#include #include "MemPool.h" #include "MemPoolChunked.h" @@ -42,9 +41,7 @@ #define FLUSH_LIMIT 1000 /* Flush memPool counters to memMeters after flush limit calls */ -#if HAVE_STRING_H -#include -#endif +#include /* * XXX This is a boundary violation between lib and src.. would be good === modified file 'lib/MemPoolChunked.cc' --- lib/MemPoolChunked.cc 2013-01-14 05:01:04 +0000 +++ lib/MemPoolChunked.cc 2014-02-21 10:46:19 +0000 @@ -80,17 +80,14 @@ */ #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif + +#include #include "MemPoolChunked.h" #define MEM_MAX_MMAP_CHUNKS 2048 -#if HAVE_STRING_H -#include -#endif +#include /* * XXX This is a boundary violation between lib and src.. would be good === modified file 'lib/MemPoolMalloc.cc' --- lib/MemPoolMalloc.cc 2014-02-11 09:57:24 +0000 +++ lib/MemPoolMalloc.cc 2014-02-21 10:46:19 +0000 @@ -32,15 +32,10 @@ */ #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif - #include "MemPoolMalloc.h" -#if HAVE_STRING_H -#include -#endif +#include +#include /* * XXX This is a boundary violation between lib and src.. would be good === modified file 'lib/Splay.cc' --- lib/Splay.cc 2012-09-01 14:38:36 +0000 +++ lib/Splay.cc 2014-02-21 10:46:19 +0000 @@ -5,12 +5,7 @@ #include "squid.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif +#include #if HAVE_UNISTD_H #include #endif === modified file 'lib/base64.c' --- lib/base64.c 2012-09-01 14:38:36 +0000 +++ lib/base64.c 2014-02-21 10:46:19 +0000 @@ -7,9 +7,6 @@ #include "squid.h" #include "base64.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STDLIB_H #include #endif === modified file 'lib/getopt.c' --- lib/getopt.c 2013-08-26 10:01:53 +0000 +++ lib/getopt.c 2014-02-21 10:46:19 +0000 @@ -33,7 +33,6 @@ static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ -#include #include #include === modified file 'lib/hash.cc' --- lib/hash.cc 2012-09-01 14:38:36 +0000 +++ lib/hash.cc 2014-02-21 10:46:19 +0000 @@ -35,15 +35,10 @@ #include "hash.h" #include "profiler/Profiler.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif @@ -52,12 +47,6 @@ #elif HAVE_MALLOC_H #include #endif -#if HAVE_ASSERT_H -#include -#endif -#if HAVE_MATH_H -#include -#endif static void hash_next_bucket(hash_table * hid); === modified file 'lib/heap.c' --- lib/heap.c 2012-09-01 14:38:36 +0000 +++ lib/heap.c 2014-02-21 10:46:19 +0000 @@ -47,9 +47,6 @@ #if HAVE_STRING_H #include #endif -#if HAVE_STDIO_H -#include -#endif #include "util.h" === modified file 'lib/html_quote.c' --- lib/html_quote.c 2012-09-01 14:38:36 +0000 +++ lib/html_quote.c 2014-02-21 10:46:19 +0000 @@ -33,9 +33,6 @@ #include "squid.h" #include "html_quote.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'lib/iso3307.c' --- lib/iso3307.c 2012-08-28 13:00:30 +0000 +++ lib/iso3307.c 2014-02-21 10:46:19 +0000 @@ -1,9 +1,6 @@ #include "squid.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'lib/libTrie/test/trie-c.c' --- lib/libTrie/test/trie-c.c 2012-01-20 18:55:04 +0000 +++ lib/libTrie/test/trie-c.c 2014-02-21 10:46:19 +0000 @@ -19,7 +19,6 @@ #include "squid.h" #include "Trie.h" -#include int main (int argc, char **argv) === modified file 'lib/libTrie/test/trie.cc' --- lib/libTrie/test/trie.cc 2013-06-11 13:13:23 +0000 +++ lib/libTrie/test/trie.cc 2014-02-21 10:46:19 +0000 @@ -21,9 +21,7 @@ #include "libTrie/Trie.h" #include "libTrie/TrieCharTransform.h" -#if HAVE_IOSTREAM #include -#endif bool CaseSensitiveCheck() === modified file 'lib/malloc_trace.cc' --- lib/malloc_trace.cc 2012-09-01 14:38:36 +0000 +++ lib/malloc_trace.cc 2014-02-21 10:46:19 +0000 @@ -36,15 +36,11 @@ #include "profiler/Profiler.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif @@ -53,15 +49,6 @@ #elif HAVE_MALLOC_H #include #endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_MATH_H -#include -#endif -#if HAVE_ASSERT_H -#include -#endif #if MEM_GEN_TRACE === modified file 'lib/md5-test.c' --- lib/md5-test.c 2012-10-04 11:10:17 +0000 +++ lib/md5-test.c 2014-02-21 10:46:19 +0000 @@ -5,7 +5,7 @@ #include "squid.h" #include "md5.h" -#include "stdio.h" +//#include "stdio.h" // ??? static void MDPrint(unsigned char digest[16]); static void MDString(char *string); === modified file 'lib/ntlmauth/ntlmauth.cc' --- lib/ntlmauth/ntlmauth.cc 2013-10-08 01:24:23 +0000 +++ lib/ntlmauth/ntlmauth.cc 2014-02-21 10:46:19 +0000 @@ -25,9 +25,7 @@ #include "squid.h" -#if HAVE_STRING_H -#include -#endif +#include #if HAVE_STRINGS_H #include #endif === modified file 'lib/profiler/Profiler.cc' --- lib/profiler/Profiler.cc 2012-09-01 14:38:36 +0000 +++ lib/profiler/Profiler.cc 2014-02-21 10:46:19 +0000 @@ -116,9 +116,7 @@ #if USE_XPROF_STATS -#if HAVE_ASSERT_H -#include -#endif +#include #if HAVE_GNUMALLLOC_H #include #elif HAVE_MALLOC_H === modified file 'lib/radix.c' --- lib/radix.c 2012-09-01 14:38:36 +0000 +++ lib/radix.c 2014-02-21 10:46:19 +0000 @@ -71,9 +71,6 @@ #if HAVE_STDLIB_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_SYS_TYPES_H #include #endif === modified file 'lib/rfc1035.c' --- lib/rfc1035.c 2012-09-01 14:38:36 +0000 +++ lib/rfc1035.c 2014-02-21 10:46:19 +0000 @@ -39,9 +39,6 @@ #include "squid.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'lib/rfc1123.c' --- lib/rfc1123.c 2012-09-01 14:38:36 +0000 +++ lib/rfc1123.c 2014-02-21 10:46:19 +0000 @@ -37,9 +37,6 @@ * Adapted from HTSUtils.c in CERN httpd 3.0 (http://info.cern.ch/httpd/) * by Darren Hardy , November 1994. */ -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'lib/rfc1738.c' --- lib/rfc1738.c 2012-09-01 14:38:36 +0000 +++ lib/rfc1738.c 2014-02-21 10:46:19 +0000 @@ -33,9 +33,6 @@ #include "squid.h" #include "rfc1738.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'lib/rfc3596.c' --- lib/rfc3596.c 2013-10-25 00:13:46 +0000 +++ lib/rfc3596.c 2014-02-21 10:46:19 +0000 @@ -57,9 +57,6 @@ #include "compat/inet_pton.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_UNISTD_H #include #endif === modified file 'lib/rfcnb/std-includes.h' --- lib/rfcnb/std-includes.h 2013-12-01 07:00:43 +0000 +++ lib/rfcnb/std-includes.h 2014-02-21 10:46:19 +0000 @@ -41,7 +41,6 @@ #endif #include #include -#include #include #define TRUE 1 === modified file 'lib/smblib/smb-errors.c' --- lib/smblib/smb-errors.c 2014-02-08 13:36:42 +0000 +++ lib/smblib/smb-errors.c 2014-02-21 10:46:19 +0000 @@ -31,8 +31,6 @@ /* ensure we don't overwrite strings when not passed enough space. Also */ /* added code to say unknown error codes if we see any */ -#include - typedef struct { char *name; int code; === modified file 'lib/smblib/std-defines.h' --- lib/smblib/std-defines.h 2010-11-21 04:40:05 +0000 +++ lib/smblib/std-defines.h 2014-02-21 10:46:19 +0000 @@ -34,7 +34,6 @@ #include #include #include -#include #include #include === modified file 'lib/snmplib/asn1.c' --- lib/snmplib/asn1.c 2012-08-28 13:00:30 +0000 +++ lib/snmplib/asn1.c 2014-02-21 10:46:19 +0000 @@ -33,8 +33,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/coexistance.c' --- lib/snmplib/coexistance.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/coexistance.c 2014-02-21 10:46:19 +0000 @@ -29,8 +29,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/mib.c' --- lib/snmplib/mib.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/mib.c 2014-02-21 10:46:19 +0000 @@ -24,8 +24,6 @@ #define SQUID_NO_STRING_BUFFER_PROTECT 1 #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/parse.c' --- lib/snmplib/parse.c 2013-06-04 02:59:47 +0000 +++ lib/snmplib/parse.c 2014-02-21 10:46:19 +0000 @@ -32,8 +32,6 @@ #include "snmp_vars.h" #include "util.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/snmp_api.c' --- lib/snmplib/snmp_api.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/snmp_api.c 2014-02-21 10:46:19 +0000 @@ -25,8 +25,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/snmp_api_error.c' --- lib/snmplib/snmp_api_error.c 2012-08-28 13:00:30 +0000 +++ lib/snmplib/snmp_api_error.c 2014-02-21 10:46:19 +0000 @@ -31,8 +31,6 @@ ***************************************************************************/ #include "squid.h" - -#include #include "snmp_api_error.h" /*************************************************************************** === modified file 'lib/snmplib/snmp_error.c' --- lib/snmplib/snmp_error.c 2012-08-28 13:00:30 +0000 +++ lib/snmplib/snmp_error.c 2014-02-21 10:46:19 +0000 @@ -27,9 +27,6 @@ **********************************************************************/ #include "squid.h" - -#include - #include "snmp_error.h" static const char *error_string[25] = { === modified file 'lib/snmplib/snmp_msg.c' --- lib/snmplib/snmp_msg.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/snmp_msg.c 2014-02-21 10:46:19 +0000 @@ -35,8 +35,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/snmp_pdu.c' --- lib/snmplib/snmp_pdu.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/snmp_pdu.c 2014-02-21 10:46:19 +0000 @@ -35,8 +35,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/snmp_vars.c' --- lib/snmplib/snmp_vars.c 2013-10-25 00:13:46 +0000 +++ lib/snmplib/snmp_vars.c 2014-02-21 10:46:19 +0000 @@ -34,8 +34,6 @@ #include "squid.h" -#include - #if HAVE_UNISTD_H #include #endif === modified file 'lib/snmplib/snmplib_debug.c' --- lib/snmplib/snmplib_debug.c 2012-01-20 18:55:04 +0000 +++ lib/snmplib/snmplib_debug.c 2014-02-21 10:46:19 +0000 @@ -1,7 +1,5 @@ #include "squid.h" -#if HAVE_STDIO_H -#include -#endif + #if HAVE_SYS_TYPES_H #include #endif === modified file 'lib/tests/testRFC1035.cc' --- lib/tests/testRFC1035.cc 2012-08-28 13:00:30 +0000 +++ lib/tests/testRFC1035.cc 2014-02-21 10:46:19 +0000 @@ -1,9 +1,7 @@ #define SQUID_UNIT_TEST 1 #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif +#include #include "testRFC1035.h" === modified file 'lib/tests/testRFC1738.cc' --- lib/tests/testRFC1738.cc 2012-08-28 13:00:30 +0000 +++ lib/tests/testRFC1738.cc 2014-02-21 10:46:19 +0000 @@ -1,9 +1,7 @@ #define SQUID_UNIT_TEST 1 #include "squid.h" -#if HAVE_ASSERT_H -#include -#endif +#include #include "testRFC1738.h" === modified file 'lib/util.c' --- lib/util.c 2012-09-01 14:38:36 +0000 +++ lib/util.c 2014-02-21 10:46:19 +0000 @@ -35,9 +35,6 @@ #include "squid.h" #include "util.h" -#if HAVE_STDIO_H -#include -#endif #if HAVE_STRING_H #include #endif === modified file 'src/ConfigParser.h' --- src/ConfigParser.h 2013-08-29 09:21:53 +0000 +++ src/ConfigParser.h 2014-02-21 10:46:19 +0000 @@ -35,11 +35,10 @@ #define SQUID_CONFIGPARSER_H #include "SquidString.h" + #include #include -#if HAVE_STRING #include -#endif class wordlist; /** === modified file 'src/CpuAffinitySet.cc' --- src/CpuAffinitySet.cc 2012-09-03 07:16:45 +0000 +++ src/CpuAffinitySet.cc 2014-02-21 10:46:19 +0000 @@ -9,12 +9,8 @@ #include "Debug.h" #include "util.h" -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include CpuAffinitySet::CpuAffinitySet() { === modified file 'src/Debug.h' --- src/Debug.h 2013-02-19 00:26:59 +0000 +++ src/Debug.h 2014-02-21 10:46:19 +0000 @@ -32,17 +32,10 @@ #ifndef SQUID_DEBUG_H #define SQUID_DEBUG_H -#if HAVE_IOSTREAM #include -#endif - #undef assert -#if HAVE_SSTREAM #include -#endif -#if HAVE_IOMANIP #include -#endif #if defined(assert) #undef assert #endif === modified file 'src/DiskIO/DiskDaemon/diskd.cc' --- src/DiskIO/DiskDaemon/diskd.cc 2013-02-13 09:19:18 +0000 +++ src/DiskIO/DiskDaemon/diskd.cc 2014-02-21 10:46:19 +0000 @@ -34,9 +34,8 @@ #include "DiskIO/DiskDaemon/diomsg.h" #include "hash.h" -#if HAVE_ERRNO_H -#include -#endif +#include +#include #if HAVE_SYS_IPC_H #include #endif @@ -46,9 +45,6 @@ #if HAVE_SYS_SHM_H #include #endif -#if HAVE_IOSTREAM -#include -#endif void xassert(const char *msg, const char *file, int line) === modified file 'src/DiskIO/DiskThreads/aiops.cc' --- src/DiskIO/DiskThreads/aiops.cc 2012-12-29 02:40:12 +0000 +++ src/DiskIO/DiskThreads/aiops.cc 2014-02-21 10:46:19 +0000 @@ -35,22 +35,21 @@ #endif #include "squid.h" +#include "DiskIO/DiskThreads/CommIO.h" #include "DiskThreads.h" #include "SquidConfig.h" +#include "SquidTime.h" +#include "Store.h" -#include +#include #include #include #include #include #include -#include #if HAVE_SCHED_H #include #endif -#include "DiskIO/DiskThreads/CommIO.h" -#include "SquidTime.h" -#include "Store.h" #define RIDICULOUS_LENGTH 4096 === modified file 'src/DiskIO/DiskThreads/aiops_win32.cc' --- src/DiskIO/DiskThreads/aiops_win32.cc 2013-09-03 09:05:02 +0000 +++ src/DiskIO/DiskThreads/aiops_win32.cc 2014-02-21 10:46:19 +0000 @@ -40,12 +40,11 @@ #include "SquidTime.h" #include "Store.h" -#include +#include #include #include #include #include -#include #define RIDICULOUS_LENGTH 4096 === modified file 'src/ETag.cc' --- src/ETag.cc 2012-09-01 14:38:36 +0000 +++ src/ETag.cc 2014-02-21 10:46:19 +0000 @@ -34,9 +34,7 @@ #include "squid.h" #include "ETag.h" -#if HAVE_CSTRING #include -#endif /* * Note: ETag is not an http "field" like, for example HttpHdrRange. ETag is a === modified file 'src/FadingCounter.cc' --- src/FadingCounter.cc 2013-10-25 00:13:46 +0000 +++ src/FadingCounter.cc 2014-02-21 10:46:19 +0000 @@ -3,9 +3,7 @@ #include "FadingCounter.h" #include "SquidTime.h" -#if HAVE_MATH_H -#include -#endif /* HAVE_MATH_H */ +#include FadingCounter::FadingCounter(): horizon(-1), precision(10), delta(-1), lastTime(0), total(0) === modified file 'src/Generic.h' --- src/Generic.h 2014-02-11 12:05:47 +0000 +++ src/Generic.h 2014-02-21 10:46:19 +0000 @@ -32,9 +32,7 @@ #include "dlink.h" -#if HAVE_OSTREAM #include -#endif template struct unary_function { === modified file 'src/HelperChildConfig.cc' --- src/HelperChildConfig.cc 2013-10-25 00:13:46 +0000 +++ src/HelperChildConfig.cc 2014-02-21 10:46:19 +0000 @@ -6,7 +6,7 @@ #include "HelperChildConfig.h" #include "Parsing.h" -#include +#include HelperChildConfig::HelperChildConfig(const unsigned int m): n_max(m), === modified file 'src/HelperReply.h' --- src/HelperReply.h 2013-04-29 13:31:05 +0000 +++ src/HelperReply.h 2014-02-21 10:46:19 +0000 @@ -5,9 +5,7 @@ #include "MemBuf.h" #include "Notes.h" -#if HAVE_OSTREAM #include -#endif class helper_stateful_server; === modified file 'src/HttpHdrCc.cc' --- src/HttpHdrCc.cc 2013-11-26 09:43:29 +0000 +++ src/HttpHdrCc.cc 2014-02-21 10:46:19 +0000 @@ -41,9 +41,7 @@ #include "Store.h" #include "StrList.h" -#if HAVE_MAP #include -#endif /* a row in the table used for parsing cache control header and statistics */ typedef struct { === modified file 'src/HttpHdrSc.cc' --- src/HttpHdrSc.cc 2013-10-31 19:13:17 +0000 +++ src/HttpHdrSc.cc 2014-02-21 10:46:19 +0000 @@ -44,9 +44,7 @@ #include "Store.h" #include "StrList.h" -#if HAVE_MAP #include -#endif /* a row in the table used for parsing surrogate-control header and statistics */ typedef struct { === modified file 'src/HttpHeaderTools.h' --- src/HttpHeaderTools.h 2013-05-26 01:08:42 +0000 +++ src/HttpHeaderTools.h 2014-02-21 10:46:19 +0000 @@ -6,18 +6,10 @@ #include "HttpHeader.h" #include "typedefs.h" -#if HAVE_FUNCTIONAL #include -#endif -#if HAVE_LIST #include -#endif -#if HAVE_MAP #include -#endif -#if HAVE_STRING #include -#endif #if HAVE_STRINGS_H #include #endif === modified file 'src/Mem.h' --- src/Mem.h 2013-01-14 05:01:04 +0000 +++ src/Mem.h 2014-02-21 10:46:19 +0000 @@ -37,9 +37,7 @@ /* for FREE */ #include "typedefs.h" -#if HAVE_IOSFWD #include -#endif class StoreEntry; class MemPoolStats; === modified file 'src/MemBlob.cc' --- src/MemBlob.cc 2014-01-01 20:13:23 +0000 +++ src/MemBlob.cc 2014-02-21 10:46:19 +0000 @@ -33,9 +33,7 @@ #include "MemBlob.h" #include "SBufDetailedStats.h" -#if HAVE_IOSTREAM #include -#endif MemBlobStats MemBlob::Stats; InstanceIdDefinitions(MemBlob, "blob"); === modified file 'src/Notes.h' --- src/Notes.h 2014-02-10 12:58:49 +0000 +++ src/Notes.h 2014-02-21 10:46:19 +0000 @@ -9,9 +9,7 @@ #include "SquidString.h" #include "typedefs.h" -#if HAVE_STRING #include -#endif #include class HttpRequest; === modified file 'src/Packer.h' --- src/Packer.h 2012-10-03 17:32:57 +0000 +++ src/Packer.h 2014-02-21 10:46:19 +0000 @@ -36,9 +36,6 @@ /* a common objPackInto interface; used by debugObj */ typedef void (*ObjPackMethod) (void *obj, Packer * p); -#if HAVE_STDIO_H -#include -#endif /* append/vprintf's for Packer */ typedef void (*append_f) (void *, const char *buf, int size); typedef void (*vprintf_f) (void *, const char *fmt, va_list args); === modified file 'src/SBuf.cc' --- src/SBuf.cc 2014-01-14 20:36:03 +0000 +++ src/SBuf.cc 2014-02-21 10:46:19 +0000 @@ -36,17 +36,9 @@ #include "SBufExceptions.h" #include "util.h" -#if HAVE_STRING_H -#include -#endif - -#if HAVE_SSTREAM +#include +#include #include -#endif - -#if HAVE_IOSTREAM -#include -#endif #ifdef VA_COPY #undef VA_COPY === modified file 'src/SBuf.h' --- src/SBuf.h 2013-12-18 17:53:43 +0000 +++ src/SBuf.h 2014-02-21 10:46:19 +0000 @@ -34,20 +34,12 @@ #include "SBufExceptions.h" #include "SquidString.h" -#if HAVE_CLIMITS #include -#elif HAVE_LIMITS_H -#include -#endif +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STDARG_H -#include -#endif -#if HAVE_IOSFWD -#include -#endif /* SBuf placeholder for printf */ #ifndef SQUIDSBUFPH === modified file 'src/SBufStream.h' --- src/SBufStream.h 2013-09-19 12:38:58 +0000 +++ src/SBufStream.h 2014-02-21 10:46:19 +0000 @@ -32,9 +32,7 @@ #include "SBuf.h" -#if HAVE_OSTREAM #include -#endif /** streambuf class for a SBuf-backed stream interface. * === modified file 'src/SquidString.h' --- src/SquidString.h 2013-12-20 05:55:43 +0000 +++ src/SquidString.h 2014-02-21 10:46:19 +0000 @@ -33,9 +33,7 @@ #ifndef SQUID_STRING_H #define SQUID_STRING_H -#if HAVE_OSTREAM #include -#endif /* squid string placeholder (for printf) */ #ifndef SQUIDSTRINGPH === modified file 'src/SquidTime.h' --- src/SquidTime.h 2010-12-12 05:30:58 +0000 +++ src/SquidTime.h 2014-02-21 10:46:19 +0000 @@ -34,9 +34,7 @@ #include "rfc1123.h" -#if HAVE_TIME_H -#include -#endif +#include /* NP: sys/time.h is provided by libcompat */ /* globals for accessing time */ === modified file 'src/StatHist.cc' --- src/StatHist.cc 2013-11-27 15:52:03 +0000 +++ src/StatHist.cc 2014-02-21 10:46:19 +0000 @@ -34,9 +34,8 @@ #include "squid.h" #include "StatHist.h" -#if HAVE_MATH_H -#include -#endif +#include + /* Local functions */ static StatHistBinDumper statHistBinDumper; === modified file 'src/Store.h' --- src/Store.h 2014-01-03 10:32:53 +0000 +++ src/Store.h 2014-02-21 10:46:19 +0000 @@ -51,9 +51,7 @@ #include "esi/Element.h" #endif -#if HAVE_OSTREAM #include -#endif class AsyncCall; class HttpRequest; === modified file 'src/StoreEntryStream.h' --- src/StoreEntryStream.h 2013-06-27 21:26:57 +0000 +++ src/StoreEntryStream.h 2014-02-21 10:46:19 +0000 @@ -33,9 +33,7 @@ #include "Store.h" -#if HAVE_OSTREAM #include -#endif /* * This class provides a streambuf interface for writing === modified file 'src/String.cc' --- src/String.cc 2013-12-21 04:54:54 +0000 +++ src/String.cc 2014-02-21 10:46:19 +0000 @@ -38,9 +38,7 @@ #include "profiler/Profiler.h" #include "Store.h" -#if HAVE_LIMITS_H -#include -#endif +#include int String::psize() const === modified file 'src/Transients.cc' --- src/Transients.cc 2013-12-31 18:49:41 +0000 +++ src/Transients.cc 2014-02-21 10:46:19 +0000 @@ -17,9 +17,7 @@ #include "tools.h" #include "Transients.h" -#if HAVE_LIMITS_H #include -#endif /// shared memory segment path to use for Transients maps static const char *MapLabel = "transients_map"; === modified file 'src/acl/Acl.h' --- src/acl/Acl.h 2014-02-10 12:58:49 +0000 +++ src/acl/Acl.h 2014-02-21 10:46:19 +0000 @@ -39,12 +39,8 @@ #include "dlink.h" #include "MemPool.h" -#if HAVE_OSTREAM #include -#endif -#if HAVE_STRING #include -#endif #include class ConfigParser; === modified file 'src/acl/Gadgets.h' --- src/acl/Gadgets.h 2014-01-06 20:55:13 +0000 +++ src/acl/Gadgets.h 2014-02-21 10:46:19 +0000 @@ -4,9 +4,7 @@ #include "acl/forward.h" #include "err_type.h" -#if HAVE_SSTREAM #include -#endif class ConfigParser; class dlink_list; === modified file 'src/acl/HttpStatus.cc' --- src/acl/HttpStatus.cc 2013-10-25 00:13:46 +0000 +++ src/acl/HttpStatus.cc 2014-02-21 10:46:19 +0000 @@ -40,9 +40,7 @@ #include "HttpReply.h" #include "wordlist.h" -#if HAVE_LIMITS_H -#include -#endif +#include static void aclParseHTTPStatusList(SplayNode **curlist); static int aclHTTPStatusCompare(acl_httpstatus_data * const &a, acl_httpstatus_data * const &b); === modified file 'src/adaptation/ecap/ServiceRep.cc' --- src/adaptation/ecap/ServiceRep.cc 2014-02-08 13:36:42 +0000 +++ src/adaptation/ecap/ServiceRep.cc 2014-02-21 10:46:19 +0000 @@ -15,9 +15,7 @@ #include #include #include -#if HAVE_LIMITS #include -#endif #include /// libecap::adapter::services indexed by their URI === modified file 'src/anyp/PortCfg.cc' --- src/anyp/PortCfg.cc 2013-08-03 06:16:46 +0000 +++ src/anyp/PortCfg.cc 2014-02-21 10:46:19 +0000 @@ -7,9 +7,7 @@ #endif #include -#if HAVE_LIMITS #include -#endif CBDATA_NAMESPACED_CLASS_INIT(AnyP, PortCfg); === modified file 'src/anyp/ProtocolType.h' --- src/anyp/ProtocolType.h 2012-06-19 21:51:49 +0000 +++ src/anyp/ProtocolType.h 2014-02-21 10:46:19 +0000 @@ -1,9 +1,7 @@ #ifndef _SQUID_SRC_ANYP_PROTOCOLTYPE_H #define _SQUID_SRC_ANYP_PROTOCOLTYPE_H -#if HAVE_OSTREAM #include -#endif namespace AnyP { === modified file 'src/anyp/ProtocolVersion.h' --- src/anyp/ProtocolVersion.h 2013-07-26 02:06:25 +0000 +++ src/anyp/ProtocolVersion.h 2014-02-21 10:46:19 +0000 @@ -3,9 +3,7 @@ #include "anyp/ProtocolType.h" -#if HAVE_OSTREAM #include -#endif namespace AnyP { === modified file 'src/anyp/UriScheme.h' --- src/anyp/UriScheme.h 2014-02-07 13:45:20 +0000 +++ src/anyp/UriScheme.h 2014-02-21 10:46:19 +0000 @@ -2,9 +2,8 @@ #define SQUID_ANYP_URISCHEME_H #include "anyp/ProtocolType.h" -#if HAVE_IOSFWD + #include -#endif namespace AnyP { === modified file 'src/base/LruMap.h' --- src/base/LruMap.h 2014-02-19 17:53:27 +0000 +++ src/base/LruMap.h 2014-02-21 10:46:19 +0000 @@ -6,12 +6,9 @@ #define SQUID_LRUMAP_H #include "SquidTime.h" -#if HAVE_LIST + #include -#endif -#if HAVE_MAP #include -#endif template class LruMap { === modified file 'src/base/RefCount.h' --- src/base/RefCount.h 2013-02-04 15:40:58 +0000 +++ src/base/RefCount.h 2014-02-21 10:46:19 +0000 @@ -36,9 +36,7 @@ // reference counting requires the Lock API on base classes #include "base/Lock.h" -#if HAVE_IOSTREAM #include -#endif /** * Template for Reference Counting pointers. === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2014-02-10 16:39:10 +0000 +++ src/cache_cf.cc 2014-02-21 10:46:19 +0000 @@ -109,12 +109,8 @@ #if HAVE_GLOB_H #include #endif -#if HAVE_LIMITS_H #include -#endif -#if HAVE_LIST #include -#endif #if HAVE_PWD_H #include #endif === modified file 'src/carp.cc' --- src/carp.cc 2014-02-07 13:45:20 +0000 +++ src/carp.cc 2014-02-21 10:46:19 +0000 @@ -41,9 +41,7 @@ #include "Store.h" #include "URL.h" -#if HAVE_MATH_H -#include -#endif +#include #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) === modified file 'src/cbdata.cc' --- src/cbdata.cc 2014-02-11 12:02:07 +0000 +++ src/cbdata.cc 2014-02-21 10:46:19 +0000 @@ -52,12 +52,10 @@ #include "Store.h" #include "Generic.h" -#if HAVE_LIMITS_H -#include -#endif +#include #if USE_CBDATA_DEBUG +#include #include -#include #endif #if WITH_VALGRIND === modified file 'src/client_side.cc' --- src/client_side.cc 2014-02-19 17:53:27 +0000 +++ src/client_side.cc 2014-02-21 10:46:19 +0000 @@ -148,15 +148,9 @@ #include "ssl/crtd_message.h" #endif -#if HAVE_LIMITS_H -#include -#endif -#if HAVE_MATH_H -#include -#endif -#if HAVE_LIMITS +#include +#include #include -#endif #if LINGERING_CLOSE #define comm_close comm_lingering_close === modified file 'src/comm.cc' --- src/comm.cc 2014-01-19 05:39:55 +0000 +++ src/comm.cc 2014-02-21 10:46:19 +0000 @@ -63,6 +63,8 @@ #include "ssl/support.h" #endif +#include +#include #if _SQUID_CYGWIN_ #include #endif @@ -72,12 +74,6 @@ #if HAVE_SYS_UN_H #include #endif -#if HAVE_MATH_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif /* * New C-like simple comm code. This stuff is a mess and doesn't really buy us anything. === modified file 'src/comm/Connection.h' --- src/comm/Connection.h 2013-05-30 09:51:25 +0000 +++ src/comm/Connection.h 2014-02-21 10:46:19 +0000 @@ -48,12 +48,8 @@ #include "eui/Eui64.h" #endif -#if HAVE_IOSFWD #include -#endif -#if HAVE_OSTREAM #include -#endif class CachePeer; === modified file 'src/comm/ModDevPoll.cc' --- src/comm/ModDevPoll.cc 2013-03-04 01:47:43 +0000 +++ src/comm/ModDevPoll.cc 2014-02-21 10:46:19 +0000 @@ -62,20 +62,16 @@ #include "StatHist.h" #include "Store.h" +#include +#include #if HAVE_SYS_DEVPOLL_H /* Solaris /dev/poll support, see "man -s 7D poll" */ #include #endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_LIMITS_H -#include -#endif #define DEBUG_DEVPOLL 0 -// OPEN_MAX is defined in +// OPEN_MAX is defined in #define DEVPOLL_UPDATESIZE OPEN_MAX #define DEVPOLL_QUERYSIZE OPEN_MAX === modified file 'src/comm/Write.cc' --- src/comm/Write.cc 2012-08-31 16:57:39 +0000 +++ src/comm/Write.cc 2014-02-21 10:46:19 +0000 @@ -9,13 +9,11 @@ #include "profiler/Profiler.h" #include "SquidTime.h" #include "StatCounters.h" - #if USE_DELAY_POOLS #include "ClientInfo.h" #endif -#if HAVE_ERRNO_H -#include -#endif + +#include void Comm::Write(const Comm::ConnectionPointer &conn, MemBuf *mb, AsyncCall::Pointer &callback) === modified file 'src/esi/Expression.cc' --- src/esi/Expression.cc 2012-11-19 11:29:31 +0000 +++ src/esi/Expression.cc 2014-02-21 10:46:19 +0000 @@ -36,12 +36,8 @@ #include "esi/Expression.h" #include "profiler/Profiler.h" -#if HAVE_MATH_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif +#include +#include /* stack precedence rules: * before pushing an operator onto the stack, the === modified file 'src/eui/Eui48.h' --- src/eui/Eui48.h 2010-11-27 14:02:42 +0000 +++ src/eui/Eui48.h 2014-02-21 10:46:19 +0000 @@ -11,14 +11,7 @@ class Address; }; -#if HAVE_CSTRING #include -#endif - -/* memcpy and friends */ -#if HAVE_STRING_H -#include -#endif namespace Eui { === modified file 'src/eui/Eui64.h' --- src/eui/Eui64.h 2010-11-27 14:02:42 +0000 +++ src/eui/Eui64.h 2014-02-21 10:46:19 +0000 @@ -8,18 +8,11 @@ class Address; } -#if HAVE_CSTRING #include -#endif #if HAVE_SYS_EUI64_H #include #endif -/* memcpy and friends */ -#if HAVE_STRING_H -#include -#endif - namespace Eui { === modified file 'src/event.cc' --- src/event.cc 2013-10-31 16:22:17 +0000 +++ src/event.cc 2014-02-21 10:46:19 +0000 @@ -39,9 +39,7 @@ #include "Store.h" #include "tools.h" -#if HAVE_MATH_H -#include -#endif +#include /* The list of event processes */ === modified file 'src/fatal.cc' --- src/fatal.cc 2013-07-06 15:11:43 +0000 +++ src/fatal.cc 2014-02-21 10:46:19 +0000 @@ -34,10 +34,6 @@ #include "SwapDir.h" #include "tools.h" -#if HAVE_STDIO_H -#include -#endif - static void fatal_common(const char *message) { === modified file 'src/fs/ufs/RebuildState.cc' --- src/fs/ufs/RebuildState.cc 2013-12-31 18:49:41 +0000 +++ src/fs/ufs/RebuildState.cc 2014-02-21 10:46:19 +0000 @@ -42,15 +42,11 @@ #include "tools.h" #include "UFSSwapLogParser.h" -#if HAVE_MATH_H -#include -#endif +#include +#include #if HAVE_SYS_STAT_H #include #endif -#if HAVE_ERRNO_H -#include -#endif CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState); === modified file 'src/fs/ufs/UFSSwapDir.cc' --- src/fs/ufs/UFSSwapDir.cc 2014-02-02 18:19:59 +0000 +++ src/fs/ufs/UFSSwapDir.cc 2014-02-21 10:46:19 +0000 @@ -52,15 +52,11 @@ #include "tools.h" #include "UFSSwapDir.h" -#if HAVE_MATH_H -#include -#endif +#include +#include #if HAVE_SYS_STAT_H #include #endif -#if HAVE_ERRNO_H -#include -#endif int Fs::Ufs::UFSSwapDir::NumberOfUFSDirs = 0; int *Fs::Ufs::UFSSwapDir::UFSDirToGlobalDirMapping = NULL; === modified file 'src/fs/ufs/UFSSwapLogParser.h' --- src/fs/ufs/UFSSwapLogParser.h 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/UFSSwapLogParser.h 2014-02-21 10:46:19 +0000 @@ -30,8 +30,6 @@ #ifndef SQUID_FS_UFS_UFSSWAPLOGPARSER_H #define SQUID_FS_UFS_UFSSWAPLOGPARSER_H -#include - class StoreSwapLogData; namespace Fs === modified file 'src/globals.h' --- src/globals.h 2014-01-24 01:57:15 +0000 +++ src/globals.h 2014-02-21 10:46:19 +0000 @@ -37,10 +37,6 @@ #include "IoStats.h" #include "rfc2181.h" -#if HAVE_STDIO_H -#include -#endif - extern char *ConfigFile; /* NULL */ extern char *IcpOpcodeStr[]; extern char tmp_error_buf[ERROR_BUF_SZ]; === modified file 'src/icmp/pinger.cc' --- src/icmp/pinger.cc 2013-01-28 06:20:02 +0000 +++ src/icmp/pinger.cc 2014-02-21 10:46:19 +0000 @@ -245,12 +245,13 @@ return 0; } -#else -#include +#else / * !USE_ICMP */ + +#include int main(int argc, char *argv[]) { - fprintf(stderr, "%s: ICMP support not compiled in.\n", argv[0]); + std::cerr << argv[0] << ": ICMP support not compiled in." << std::endl; return 1; } === modified file 'src/int.cc' --- src/int.cc 2012-08-31 11:19:34 +0000 +++ src/int.cc 2014-02-21 10:46:19 +0000 @@ -32,9 +32,7 @@ #include "squid.h" -#if HAVE_MATH_H -#include -#endif +#include int isPowTen(int count) === modified file 'src/ip/Address.cc' --- src/ip/Address.cc 2013-10-25 00:13:46 +0000 +++ src/ip/Address.cc 2014-02-21 10:46:19 +0000 @@ -11,12 +11,8 @@ #include "ip/tools.h" #include "util.h" -#if HAVE_ASSERT_H -#include -#endif -#if HAVE_STRING_H -#include -#endif +#include +#include #if HAVE_ARPA_INET_H /* for inet_ntoa() */ #include === modified file 'src/ip/Address.h' --- src/ip/Address.h 2013-06-04 05:12:39 +0000 +++ src/ip/Address.h 2014-02-21 10:46:19 +0000 @@ -6,6 +6,8 @@ #ifndef _SQUID_SRC_IP_ADDRESS_H #define _SQUID_SRC_IP_ADDRESS_H +#include +#include #if HAVE_SYS_SOCKET_H #include #endif @@ -22,13 +24,6 @@ #include #endif -#if HAVE_IOSFWD -#include -#endif -#if HAVE_OSTREAM -#include -#endif - namespace Ip { === modified file 'src/ip/Intercept.cc' --- src/ip/Intercept.cc 2013-10-25 00:13:46 +0000 +++ src/ip/Intercept.cc 2014-02-21 10:46:19 +0000 @@ -92,10 +92,8 @@ #endif /* PF_TRANSPARENT required headers */ #if LINUX_NETFILTER -#if HAVE_LIMITS_H -/* must be before including netfilter_ipv4.h */ -#include -#endif +/* must be before including netfilter_ipv4.h */ +#include #include #include #if HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H === modified file 'src/ip/QosConfig.h' --- src/ip/QosConfig.h 2014-01-11 01:35:50 +0000 +++ src/ip/QosConfig.h 2014-02-21 10:46:19 +0000 @@ -8,14 +8,10 @@ #if HAVE_LIBNETFILTER_CONNTRACK_LIBNETFILTER_CONNTRACK_H #include #endif - #if HAVE_LIBNETFILTER_CONNTRACK_LIBNETFILTER_CONNTRACK_TCP_H #include #endif - -#if HAVE_LIMITS #include -#endif class fde; === modified file 'src/ip/testAddress.cc' --- src/ip/testAddress.cc 2013-10-25 00:13:46 +0000 +++ src/ip/testAddress.cc 2014-02-21 10:46:19 +0000 @@ -1,13 +1,12 @@ #define SQUID_UNIT_TEST 1 #include "squid.h" -//#include "compat/getaddrinfo.h" #include "ip/Address.h" #include "ip/tools.h" #include "testAddress.h" -#if HAVE_CSTRING #include -#endif +#include +#include #if HAVE_NETINET_IN_H #include #endif @@ -17,12 +16,6 @@ #if HAVE_NETDB_H #include #endif -#if HAVE_STRING -#include -#endif -#if HAVE_STDEXCEPT -#include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testIpAddress ); === modified file 'src/ipc/Kid.cc' --- src/ipc/Kid.cc 2013-11-21 15:36:36 +0000 +++ src/ipc/Kid.cc 2014-02-21 10:46:19 +0000 @@ -7,10 +7,7 @@ #include "globals.h" #include "ipc/Kid.h" -#if HAVE_TIME_H -#include -#endif - +#include #if HAVE_SYS_WAIT_H #include #endif === modified file 'src/ipc/StartListening.h' --- src/ipc/StartListening.h 2013-10-25 00:13:46 +0000 +++ src/ipc/StartListening.h 2014-02-21 10:46:19 +0000 @@ -12,9 +12,7 @@ #include "ip/forward.h" #include "ipc/FdNotes.h" -#if HAVE_IOSFWD #include -#endif namespace Ipc { === modified file 'src/ipc/TypedMsgHdr.cc' --- src/ipc/TypedMsgHdr.cc 2013-11-07 02:04:25 +0000 +++ src/ipc/TypedMsgHdr.cc 2014-02-21 10:46:19 +0000 @@ -8,7 +8,7 @@ #include "ipc/TypedMsgHdr.h" #include "tools.h" -#include +#include Ipc::TypedMsgHdr::TypedMsgHdr() { === modified file 'src/ipc/mem/Page.cc' --- src/ipc/mem/Page.cc 2012-09-01 14:38:36 +0000 +++ src/ipc/mem/Page.cc 2014-02-21 10:46:19 +0000 @@ -6,9 +6,7 @@ #include "squid.h" #include "ipc/mem/Page.h" -#if HAVE_IOSTREAM #include -#endif std::ostream &Ipc::Mem::operator <<(std::ostream &os, const PageId &page) { === modified file 'src/ipc/mem/Page.h' --- src/ipc/mem/Page.h 2013-01-07 17:14:28 +0000 +++ src/ipc/mem/Page.h 2014-02-21 10:46:19 +0000 @@ -1,12 +1,7 @@ -/* - */ - #ifndef SQUID_IPC_MEM_PAGE_H #define SQUID_IPC_MEM_PAGE_H -#if HAVE_IOSFWD #include -#endif namespace Ipc { === modified file 'src/log/TcpLogger.h' --- src/log/TcpLogger.h 2013-05-12 00:13:05 +0000 +++ src/log/TcpLogger.h 2014-02-21 10:46:19 +0000 @@ -4,9 +4,7 @@ #include "base/AsyncJob.h" #include "ip/Address.h" -#if HAVE_LIST #include -#endif class MemBlob; typedef RefCount MemBlobPointer; === modified file 'src/mem.cc' --- src/mem.cc 2013-10-25 00:13:46 +0000 +++ src/mem.cc 2014-02-21 10:46:19 +0000 @@ -51,12 +51,8 @@ #include "Store.h" #include "StoreEntryStream.h" -#if HAVE_IOMANIP #include -#endif -#if HAVE_OSTREAM #include -#endif /* forward declarations */ static void memFree2K(void *); @@ -635,9 +631,7 @@ MemPoolMeter *pm = mp_st->meter; const char *delim = "\t "; -#if HAVE_IOMANIP stream.setf(std::ios_base::fixed); -#endif stream << std::setw(20) << std::left << mp_st->label << delim; stream << std::setw(4) << std::right << mp_st->obj_size << delim; === modified file 'src/peer_sourcehash.cc' --- src/peer_sourcehash.cc 2013-06-03 14:05:16 +0000 +++ src/peer_sourcehash.cc 2014-02-21 10:46:19 +0000 @@ -40,9 +40,7 @@ #include "SquidConfig.h" #include "Store.h" -#if HAVE_MATH_H -#include -#endif +#include #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) === modified file 'src/peer_userhash.cc' --- src/peer_userhash.cc 2012-09-04 15:15:51 +0000 +++ src/peer_userhash.cc 2014-02-21 10:46:19 +0000 @@ -45,9 +45,7 @@ #include "SquidConfig.h" #include "Store.h" -#if HAVE_MATH_H -#include -#endif +#include #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) === modified file 'src/recv-announce.cc' --- src/recv-announce.cc 2013-06-03 14:05:16 +0000 +++ src/recv-announce.cc 2014-02-21 10:46:19 +0000 @@ -31,15 +31,14 @@ */ #include "squid.h" -#include +#include +#include #include -#include #include #include #include #include #include -#include #define RECV_BUF_SIZE 8192 === modified file 'src/repl/heap/store_heap_replacement.cc' --- src/repl/heap/store_heap_replacement.cc 2013-12-19 23:13:24 +0000 +++ src/repl/heap/store_heap_replacement.cc 2014-02-21 10:46:19 +0000 @@ -46,9 +46,7 @@ #include "Store.h" #include "store_heap_replacement.h" -#if HAVE_MATH_H -#include -#endif +#include /* * Key generation function to implement the LFU-DA policy (Least === modified file 'src/snmp/Pdu.cc' --- src/snmp/Pdu.cc 2013-10-25 00:13:46 +0000 +++ src/snmp/Pdu.cc 2014-02-21 10:46:19 +0000 @@ -10,9 +10,8 @@ #include "snmp/Var.h" #include "snmp_core.h" #include "tools.h" -#if HAVE_ALGORITHM + #include -#endif Snmp::Pdu::Pdu() { === modified file 'src/snmp/Var.cc' --- src/snmp/Var.cc 2012-11-29 08:51:27 +0000 +++ src/snmp/Var.cc 2014-02-21 10:46:19 +0000 @@ -9,9 +9,8 @@ #include "ipc/TypedMsgHdr.h" #include "snmp/Var.h" #include "tools.h" -#if HAVE_ALGORITHM + #include -#endif Snmp::Var::Var() { === modified file 'src/ssl/ErrorDetail.cc' --- src/ssl/ErrorDetail.cc 2013-11-23 00:58:42 +0000 +++ src/ssl/ErrorDetail.cc 2014-02-21 10:46:19 +0000 @@ -1,12 +1,9 @@ #include "squid.h" #include "errorpage.h" #include "ssl/ErrorDetail.h" -#if HAVE_MAP + +#include #include -#endif -#if HAVE_CLIMITS -#include -#endif struct SslErrorEntry { Ssl::ssl_error_t value; === modified file 'src/ssl/ErrorDetailManager.h' --- src/ssl/ErrorDetailManager.h 2013-10-25 00:13:46 +0000 +++ src/ssl/ErrorDetailManager.h 2014-02-21 10:46:19 +0000 @@ -6,12 +6,8 @@ #include "SquidString.h" #include "ssl/support.h" -#if HAVE_MAP #include -#endif -#if HAVE_STRING #include -#endif class HttpRequest; === modified file 'src/ssl/certificate_db.cc' --- src/ssl/certificate_db.cc 2013-07-04 00:10:48 +0000 +++ src/ssl/certificate_db.cc 2014-02-21 10:46:19 +0000 @@ -1,14 +1,9 @@ #include "squid.h" #include "ssl/certificate_db.h" -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_FSTREAM + +#include #include -#endif -#if HAVE_STDEXCEPT #include -#endif #if HAVE_SYS_STAT_H #include #endif === modified file 'src/ssl/certificate_db.h' --- src/ssl/certificate_db.h 2013-05-15 15:41:43 +0000 +++ src/ssl/certificate_db.h 2014-02-21 10:46:19 +0000 @@ -2,12 +2,11 @@ #define SQUID_SSL_CERTIFICATE_DB_H #include "ssl/gadgets.h" -#if HAVE_STRING -#include -#endif + #if HAVE_OPENSSL_OPENSSLV_H #include #endif +#include namespace Ssl { === modified file 'src/ssl/context_storage.cc' --- src/ssl/context_storage.cc 2014-02-19 17:53:27 +0000 +++ src/ssl/context_storage.cc 2014-02-21 10:46:19 +0000 @@ -3,9 +3,8 @@ #include "ssl/context_storage.h" #include "Store.h" #include "StoreEntryStream.h" -#if HAVE_LIMITS + #include -#endif #if USE_SSL #include #endif === modified file 'src/ssl/context_storage.h' --- src/ssl/context_storage.h 2014-02-19 17:53:27 +0000 +++ src/ssl/context_storage.h 2014-02-21 10:46:19 +0000 @@ -10,12 +10,9 @@ #include "mgr/Command.h" #include "SquidTime.h" #include "ssl/gadgets.h" -#if HAVE_MAP + +#include #include -#endif -#if HAVE_LIST -#include -#endif #include /// TODO: Replace on real size. === modified file 'src/ssl/crtd_message.cc' --- src/ssl/crtd_message.cc 2013-10-25 00:13:46 +0000 +++ src/ssl/crtd_message.cc 2014-02-21 10:46:19 +0000 @@ -1,15 +1,10 @@ #include "squid.h" #include "ssl/crtd_message.h" #include "ssl/gadgets.h" -#if HAVE_CSTDLIB + #include -#endif -#if HAVE_CSTRING #include -#endif -#if HAVE_STDEXCEPT #include -#endif Ssl::CrtdMessage::CrtdMessage(MessageKind kind) : body_size(0), state(kind == REPLY ? BEFORE_LENGTH: BEFORE_CODE) === modified file 'src/ssl/crtd_message.h' --- src/ssl/crtd_message.h 2014-01-11 01:35:50 +0000 +++ src/ssl/crtd_message.h 2014-02-21 10:46:19 +0000 @@ -1,12 +1,8 @@ #ifndef SQUID_SSL_CRTD_MESSAGE_H #define SQUID_SSL_CRTD_MESSAGE_H -#if HAVE_STRING +#include #include -#endif -#if HAVE_MAP -#include -#endif namespace Ssl { === modified file 'src/ssl/gadgets.h' --- src/ssl/gadgets.h 2013-06-30 15:54:22 +0000 +++ src/ssl/gadgets.h 2014-02-21 10:46:19 +0000 @@ -14,9 +14,7 @@ #if HAVE_OPENSSL_TXT_DB_H #include #endif -#if HAVE_STRING #include -#endif namespace Ssl { === modified file 'src/ssl/ssl_crtd.cc' --- src/ssl/ssl_crtd.cc 2013-10-25 00:13:46 +0000 +++ src/ssl/ssl_crtd.cc 2014-02-21 10:46:19 +0000 @@ -3,21 +3,11 @@ #include "ssl/certificate_db.h" #include "ssl/crtd_message.h" -#if HAVE_CSTRING #include -#endif -#if HAVE_SSTREAM +#include #include -#endif -#if HAVE_IOSTREAM -#include -#endif -#if HAVE_STDEXCEPT #include -#endif -#if HAVE_STRING #include -#endif #if HAVE_GETOPT_H #include #endif === modified file 'src/store.cc' --- src/store.cc 2014-02-12 09:19:06 +0000 +++ src/store.cc 2014-02-21 10:46:19 +0000 @@ -69,10 +69,8 @@ #if USE_DELAY_POOLS #include "DelayPools.h" #endif -#if HAVE_LIMITS_H -#include -#endif +#include #include #define REBUILD_TIMESTAMP_DELTA_MAX 2 === modified file 'src/store_digest.cc' --- src/store_digest.cc 2013-12-19 04:53:35 +0000 +++ src/store_digest.cc 2014-02-21 10:46:19 +0000 @@ -56,9 +56,7 @@ #include "Store.h" #include "StoreSearch.h" -#if HAVE_MATH_H -#include -#endif +#include /* * local types === modified file 'src/store_dir.cc' --- src/store_dir.cc 2014-02-04 16:54:49 +0000 +++ src/store_dir.cc 2014-02-21 10:46:19 +0000 @@ -48,6 +48,8 @@ #include "tools.h" #include "Transients.h" +#include +#include #if HAVE_STATVFS #if HAVE_SYS_STATVFS_H #include @@ -57,9 +59,6 @@ #if HAVE_SYS_PARAM_H #include #endif -#if HAVE_LIMITS_H -#include -#endif #if HAVE_SYS_MOUNT_H #include #endif @@ -70,9 +69,6 @@ #if HAVE_SYS_WAIT_H #include #endif -#if HAVE_ERRNO_H -#include -#endif static STDIRSELECT storeDirSelectSwapDirRoundRobin; static STDIRSELECT storeDirSelectSwapDirLeastLoad; === modified file 'src/tests/SBufFindTest.h' --- src/tests/SBufFindTest.h 2013-10-04 13:55:21 +0000 +++ src/tests/SBufFindTest.h 2014-02-21 10:46:19 +0000 @@ -3,10 +3,8 @@ #include "SBuf.h" -#if HAVE_STRING +#include #include -#endif -#include /// Generates and executes a [configurable] large number of SBuf::*find() /// test cases using random strings. Reports detected failures. === modified file 'src/tests/stub_HelperChildConfig.cc' --- src/tests/stub_HelperChildConfig.cc 2013-10-25 00:13:46 +0000 +++ src/tests/stub_HelperChildConfig.cc 2014-02-21 10:46:19 +0000 @@ -5,7 +5,7 @@ #define STUB_API "stub_HelperChildconfig.cc" #include "tests/STUB.h" -#include +#include HelperChildConfig::HelperChildConfig(const unsigned int m): n_max(m), === modified file 'src/tests/stub_debug.cc' --- src/tests/stub_debug.cc 2012-12-15 01:13:21 +0000 +++ src/tests/stub_debug.cc 2014-02-21 10:46:19 +0000 @@ -8,10 +8,6 @@ #include "squid.h" #include "Debug.h" -#if HAVE_STDIO_H -#include -#endif - FILE *debug_log = NULL; int Debug::TheDepth = 0; === modified file 'src/tests/stub_store_rebuild.cc' --- src/tests/stub_store_rebuild.cc 2013-12-31 18:49:41 +0000 +++ src/tests/stub_store_rebuild.cc 2014-02-21 10:46:19 +0000 @@ -34,9 +34,8 @@ #include "MemBuf.h" #include "store_rebuild.h" #include "SwapDir.h" -#if HAVE_STRING_H -#include -#endif + +#include #define STUB_API "stub_store_rebuild.cc" #include "tests/STUB.h" === modified file 'src/tests/testACLMaxUserIP.cc' --- src/tests/testACLMaxUserIP.cc 2014-01-15 01:59:19 +0000 +++ src/tests/testACLMaxUserIP.cc 2014-02-21 10:46:19 +0000 @@ -1,5 +1,4 @@ #define SQUID_UNIT_TEST 1 - #include "squid.h" #if USE_AUTH @@ -8,9 +7,7 @@ #include "ConfigParser.h" #include "testACLMaxUserIP.h" -#if HAVE_STDEXCEPT #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testACLMaxUserIP ); === modified file 'src/tests/testAuth.cc' --- src/tests/testAuth.cc 2013-10-25 00:13:46 +0000 +++ src/tests/testAuth.cc 2014-02-21 10:46:19 +0000 @@ -166,9 +166,7 @@ } } -#if HAVE_IOSTREAM #include -#endif /* AuthUserRequest::scheme returns the correct scheme for all * authentication types === modified file 'src/tests/testBoilerplate.cc' --- src/tests/testBoilerplate.cc 2013-11-18 17:03:55 +0000 +++ src/tests/testBoilerplate.cc 2014-02-21 10:46:19 +0000 @@ -1,11 +1,9 @@ #define SQUID_UNIT_TEST 1 - #include "squid.h" + #include "testBoilerplate.h" -#if HAVE_STDEXCEPT #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testBoilerplate ); === modified file 'src/tests/testDiskIO.cc' --- src/tests/testDiskIO.cc 2013-10-25 00:13:46 +0000 +++ src/tests/testDiskIO.cc 2014-02-21 10:46:19 +0000 @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 - #include "squid.h" + #include "DiskIO/DiskIOModule.h" #include "HttpHeader.h" #include "HttpReply.h" @@ -12,9 +12,7 @@ #include "testDiskIO.h" #include "testStoreSupport.h" -#if HAVE_STDEXCEPT #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testDiskIO ); === modified file 'src/tests/testHttpRequestMethod.cc' --- src/tests/testHttpRequestMethod.cc 2013-12-18 03:00:01 +0000 +++ src/tests/testHttpRequestMethod.cc 2014-02-21 10:46:19 +0000 @@ -8,9 +8,7 @@ #include "SquidConfig.h" #include "testHttpRequestMethod.h" -#if HAVE_SSTREAM #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequestMethod ); === modified file 'src/tests/testRock.cc' --- src/tests/testRock.cc 2014-02-08 13:36:42 +0000 +++ src/tests/testRock.cc 2014-02-21 10:46:19 +0000 @@ -18,12 +18,10 @@ #include "testRock.h" #include "testStoreSupport.h" +#include #if HAVE_SYS_STAT_H #include #endif -#if HAVE_STDEXCEPT -#include -#endif #if HAVE_UNISTD_H #include #endif === modified file 'src/tests/testStoreEntryStream.cc' --- src/tests/testStoreEntryStream.cc 2013-12-19 23:13:24 +0000 +++ src/tests/testStoreEntryStream.cc 2014-02-21 10:46:19 +0000 @@ -8,10 +8,7 @@ #include "testStore.h" #include "testStoreEntryStream.h" -#if HAVE_IOMANIP #include -#endif - #include CPPUNIT_TEST_SUITE_REGISTRATION( testStoreEntryStream ); === modified file 'src/tests/testURL.cc' --- src/tests/testURL.cc 2014-02-07 13:45:20 +0000 +++ src/tests/testURL.cc 2014-02-21 10:46:19 +0000 @@ -7,9 +7,7 @@ #include "testURL.h" #include "URL.h" -#if HAVE_SSTREAM #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testURL ); === modified file 'src/tests/testUfs.cc' --- src/tests/testUfs.cc 2014-02-08 13:36:42 +0000 +++ src/tests/testUfs.cc 2014-02-21 10:46:19 +0000 @@ -15,9 +15,7 @@ #include "testStoreSupport.h" #include "testUfs.h" -#if HAVE_STDEXCEPT #include -#endif #define TESTDIR "testUfs_Store" === modified file 'src/tests/testUriScheme.cc' --- src/tests/testUriScheme.cc 2014-02-07 13:45:20 +0000 +++ src/tests/testUriScheme.cc 2014-02-21 10:46:19 +0000 @@ -9,9 +9,7 @@ #include "SquidString.h" #include "tests/testUriScheme.h" -#if HAVE_SSTREAM #include -#endif CPPUNIT_TEST_SUITE_REGISTRATION( testUriScheme ); === modified file 'src/tunnel.cc' --- src/tunnel.cc 2014-02-10 17:52:49 +0000 +++ src/tunnel.cc 2014-02-21 10:46:19 +0000 @@ -55,12 +55,8 @@ #include "DelayId.h" #endif -#if HAVE_LIMITS_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif +#include +#include /** * TunnelStateData is the state engine performing the tasks for === modified file 'src/ufsdump.cc' --- src/ufsdump.cc 2013-10-25 00:13:46 +0000 +++ src/ufsdump.cc 2014-02-21 10:46:19 +0000 @@ -41,15 +41,9 @@ #undef malloc #undef free -#if HAVE_STDEXCEPT +#include +#include #include -#endif -#if HAVE_IOSTREAM -#include -#endif -#if HAVE_CASSERT -#include -#endif /* stub functions for parts of squid not factored to be dynamic yet */ void === modified file 'test-suite/MemPoolTest.cc' --- test-suite/MemPoolTest.cc 2012-09-01 14:38:36 +0000 +++ test-suite/MemPoolTest.cc 2014-02-21 10:46:19 +0000 @@ -36,9 +36,7 @@ #include "MemPool.h" -#if HAVE_IOSTREAM #include -#endif /* TODO: put this in a libTest */ void === modified file 'test-suite/VirtualDeleteOperator.cc' --- test-suite/VirtualDeleteOperator.cc 2012-09-01 14:38:36 +0000 +++ test-suite/VirtualDeleteOperator.cc 2014-02-21 10:46:19 +0000 @@ -33,9 +33,7 @@ #include "squid.h" -#if HAVE_IOSTREAM #include -#endif class CallCounter { === modified file 'test-suite/hash.c' --- test-suite/hash.c 2012-09-01 14:38:36 +0000 +++ test-suite/hash.c 2014-02-21 10:46:19 +0000 @@ -35,9 +35,6 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_CTYPE_H #include #endif === modified file 'test-suite/mem_hdr_test.cc' --- test-suite/mem_hdr_test.cc 2013-10-25 00:13:46 +0000 +++ test-suite/mem_hdr_test.cc 2014-02-21 10:46:19 +0000 @@ -38,12 +38,8 @@ #include "mem_node.h" #include "stmem.h" -#if HAVE_IOSTREAM #include -#endif -#if HAVE_SSTREAM #include -#endif /*For a reason required on some platforms */ unsigned int TextException::FileNameHash(const char *fname) === modified file 'test-suite/mem_node_test.cc' --- test-suite/mem_node_test.cc 2012-09-01 14:38:36 +0000 +++ test-suite/mem_node_test.cc 2014-02-21 10:46:19 +0000 @@ -34,9 +34,7 @@ #include "squid.h" #include "mem_node.h" -#if HAVE_IOSTREAM #include -#endif /* TODO: put this in a libTest */ void === modified file 'test-suite/membanger.c' --- test-suite/membanger.c 2014-02-08 13:36:42 +0000 +++ test-suite/membanger.c 2014-02-21 10:46:19 +0000 @@ -4,9 +4,6 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_CTYPE_H #include #endif === modified file 'test-suite/pconn-banger.c' --- test-suite/pconn-banger.c 2014-02-08 13:36:42 +0000 +++ test-suite/pconn-banger.c 2014-02-21 10:46:19 +0000 @@ -4,9 +4,6 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_FCNTL_H #include #endif === modified file 'test-suite/splay.cc' --- test-suite/splay.cc 2013-01-21 07:15:09 +0000 +++ test-suite/splay.cc 2014-02-21 10:46:19 +0000 @@ -5,12 +5,7 @@ #include "squid.h" -#if HAVE_STDIO_H -#include -#endif -#if HAVE_STDLIB_H -#include -#endif +#include #if HAVE_UNISTD_H #include #endif === modified file 'test-suite/syntheticoperators.cc' --- test-suite/syntheticoperators.cc 2013-10-25 00:13:46 +0000 +++ test-suite/syntheticoperators.cc 2014-02-21 10:46:19 +0000 @@ -35,9 +35,7 @@ #include "mem_node.h" #include "stmem.h" -#if HAVE_IOSTREAM #include -#endif class HasExplicit { === modified file 'test-suite/tcp-banger2.c' --- test-suite/tcp-banger2.c 2014-02-08 13:36:42 +0000 +++ test-suite/tcp-banger2.c 2014-02-21 10:46:19 +0000 @@ -34,9 +34,6 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_FCNTL_H #include #endif === modified file 'test-suite/tcp-banger3.c' --- test-suite/tcp-banger3.c 2012-08-28 13:00:30 +0000 +++ test-suite/tcp-banger3.c 2014-02-21 10:46:19 +0000 @@ -34,9 +34,6 @@ #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif #if HAVE_FCNTL_H #include #endif === modified file 'tools/cachemgr.cc' --- tools/cachemgr.cc 2013-06-03 14:05:16 +0000 +++ tools/cachemgr.cc 2014-02-21 10:46:19 +0000 @@ -39,18 +39,14 @@ #include "rfc1738.h" #include "util.h" +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include #endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif #if HAVE_FCNTL_H #include #endif @@ -71,12 +67,6 @@ #if HAVE_PWD_H #include #endif -#if HAVE_SIGNAL_H -#include -#endif -#if HAVE_TIME_H -#include -#endif #if HAVE_SYS_PARAM_H #include #endif @@ -101,9 +91,6 @@ #if HAVE_LIBC_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_STRINGS_H #include #endif === modified file 'tools/purge/conffile.cc' --- tools/purge/conffile.cc 2014-02-08 13:36:42 +0000 +++ tools/purge/conffile.cc 2014-02-21 10:46:19 +0000 @@ -35,13 +35,13 @@ // // #include "conffile.hh" + +#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include int readConfigFile( CacheDirVector& cachedir, const char* fn, FILE* debug ) === modified file 'tools/purge/conffile.hh' --- tools/purge/conffile.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/conffile.hh 2014-02-21 10:46:19 +0000 @@ -52,7 +52,6 @@ #define DEFAULT_SQUID_CONF "/usr/local/squid/etc/squid.conf" #endif -#include #include struct CacheDir { === modified file 'tools/purge/convert.cc' --- tools/purge/convert.cc 2013-08-25 06:36:13 +0000 +++ tools/purge/convert.cc 2014-02-21 10:46:19 +0000 @@ -42,12 +42,12 @@ // #include "convert.hh" -#include + +#include +#include #include #include #include -#include -#include #ifndef SA #define SA struct sockaddr === modified file 'tools/purge/copyout.cc' --- tools/purge/copyout.cc 2013-08-25 06:36:13 +0000 +++ tools/purge/copyout.cc 2014-02-21 10:46:19 +0000 @@ -38,13 +38,10 @@ #include "squid.h" #include "copyout.hh" -//#include -//#include #include -#include -#include +#include +#include #include -#include #include #include === modified file 'tools/purge/purge.cc' --- tools/purge/purge.cc 2013-10-25 00:13:46 +0000 +++ tools/purge/purge.cc 2014-02-21 10:46:19 +0000 @@ -93,18 +93,17 @@ #include "squid.h" #include "util.h" -#include -#include +#include +#include +#include +#include +#include +#include #include -#include #include #include #include #include -#include -#include -#include -#include #if HAVE_SIGINFO_H #include === modified file 'tools/purge/signal.cc' --- tools/purge/signal.cc 2013-08-25 06:36:13 +0000 +++ tools/purge/signal.cc 2014-02-21 10:46:19 +0000 @@ -44,14 +44,11 @@ #include "squid.h" #include "signal.hh" -//#include -#include -#include +#include +#include #include -#include #include #include -//#include SigFunc* Signal( int signo, SigFunc* newhandler, bool doInterrupt ) === modified file 'tools/purge/signal.hh' --- tools/purge/signal.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/signal.hh 2014-02-21 10:46:19 +0000 @@ -50,9 +50,7 @@ #include "squid.h" -#if HAVE_SIGNAL_H -#include -#endif +#include #if !defined(__cplusplus) #ifndef HAVE_BOOL === modified file 'tools/purge/socket.cc' --- tools/purge/socket.cc 2013-08-25 06:36:13 +0000 +++ tools/purge/socket.cc 2014-02-21 10:46:19 +0000 @@ -43,13 +43,13 @@ // // #include "socket.hh" + +#include +#include #include #include #include -#include -#include -#include #include #include "convert.hh" === modified file 'tools/purge/squid-tlv.cc' --- tools/purge/squid-tlv.cc 2013-08-25 06:36:13 +0000 +++ tools/purge/squid-tlv.cc 2014-02-21 10:46:19 +0000 @@ -33,7 +33,6 @@ // // #include "squid.h" -//#include #include "squid-tlv.hh" SquidTLV::SquidTLV( SquidMetaType _type, size_t _size, void* _data ) === modified file 'tools/squidclient/squidclient.cc' --- tools/squidclient/squidclient.cc 2014-02-20 23:33:29 +0000 +++ tools/squidclient/squidclient.cc 2014-02-21 10:46:19 +0000 @@ -44,28 +44,22 @@ /** \endcond */ #endif +#include #include -#include +#include #include - #if _SQUID_WINDOWS_ #include #endif #if HAVE_SYS_SOCKET_H #include #endif -#if HAVE_STRING_H -#include -#endif #if HAVE_UNISTD_H #include #endif #if HAVE_NETDB_H #include #endif -#if HAVE_ERRNO_H -#include -#endif #if HAVE_SYS_STAT_H #include #endif