From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 20 Sep 2012 09:13:58 +0000 (+0200)
Subject: Removed/reworked some header inclusions.
X-Git-Tag: SQUID_3_3_0_1~33^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fafe8849741d374c03436ac862dae07cc4e3b51f;p=thirdparty%2Fsquid.git

Removed/reworked some header inclusions.
---

diff --git a/src/ConfigOption.h b/src/ConfigOption.h
index 532ac02153..f881ce00ef 100644
--- a/src/ConfigOption.h
+++ b/src/ConfigOption.h
@@ -30,11 +30,11 @@
 #ifndef SQUID_CONFIGOPTION_H
 #define SQUID_CONFIGOPTION_H
 
-class StoreEntry;
-
 /* for Vector<> */
 #include "Array.h"
 
+class StoreEntry;
+
 /* cache option parsers */
 
 class ConfigOption
diff --git a/src/DnsLookupDetails.h b/src/DnsLookupDetails.h
index 29c13bfbb8..09924a27e6 100644
--- a/src/DnsLookupDetails.h
+++ b/src/DnsLookupDetails.h
@@ -5,7 +5,6 @@
 #ifndef SQUID_DNS_LOOKUP_DETAILS_H
 #define SQUID_DNS_LOOKUP_DETAILS_H
 
-#include "typedefs.h"
 #include "SquidString.h"
 
 /// encapsulates DNS lookup results
diff --git a/src/ETag.h b/src/ETag.h
index 0c3f1ae945..9f37a819f5 100644
--- a/src/ETag.h
+++ b/src/ETag.h
@@ -14,10 +14,10 @@ public:
 };
 
 /* ETag */
-SQUIDCEXTERN int etagParseInit(ETag * etag, const char *str);
+int etagParseInit(ETag * etag, const char *str);
 /// whether etags are strong-equal
-SQUIDCEXTERN bool etagIsStrongEqual(const ETag &tag1, const ETag &tag2);
+bool etagIsStrongEqual(const ETag &tag1, const ETag &tag2);
 /// whether etags are weak-equal
-SQUIDCEXTERN bool etagIsWeakEqual(const ETag &tag1, const ETag &tag2);
+bool etagIsWeakEqual(const ETag &tag1, const ETag &tag2);
 
 #endif /* _SQUIDETAG_H */
diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h
index 2de3bacfa0..e4fd9f8dd0 100644
--- a/src/HierarchyLogEntry.h
+++ b/src/HierarchyLogEntry.h
@@ -34,6 +34,7 @@
 
 #include "comm/Connection.h"
 #include "hier_code.h"
+#include "HttpStatusCode.h"
 #include "lookup_t.h"
 #include "rfc2181.h"
 #include "PingData.h"
diff --git a/src/client_db.h b/src/client_db.h
index 7b0f03f5d3..f0411d7c08 100644
--- a/src/client_db.h
+++ b/src/client_db.h
@@ -36,6 +36,9 @@
 #include "anyp/ProtocolType.h"
 #include "enums.h"
 #include "ip/Address.h"
+namespace Ip {
+class Address;
+}
 
 class StoreEntry;
 class ClientInfo;
diff --git a/src/comm.h b/src/comm.h
index 32dab7a09f..a6597a1011 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -6,9 +6,13 @@
 #include "CommCalls.h"
 #include "comm_err_t.h"
 #include "comm/IoCallback.h"
-#include "ip/Address.h"
+//#include "ip/Address.h"
 #include "StoreIOBuffer.h"
 
+namespace Ip {
+class Address;
+}
+
 /* comm.c */
 extern bool comm_iocallbackpending(void); /* inline candidate */
 
diff --git a/src/enums.h b/src/enums.h
index d255d0eb74..90ab3df1ec 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -32,8 +32,6 @@
 #ifndef SQUID_ENUMS_H
 #define SQUID_ENUMS_H
 
-#include "HttpStatusCode.h"
-
 typedef enum {
     LOG_TAG_NONE,
     LOG_TCP_HIT,
@@ -192,8 +190,7 @@ enum {
     SNMP_C_USER,
     SNMP_C_COMMUNITY
 };
-
-#endif
+#endif /* SQUID_SNMP */
 
 typedef enum {
     MEM_NONE,
@@ -318,7 +315,7 @@ enum {
     _WIN_OS_WINLON,
     _WIN_OS_WIN7
 };
-#endif
+#endif /* _SQUID_WINDOWS_ */
 
 enum {
     DISABLE_PMTU_OFF,
@@ -334,6 +331,6 @@ typedef enum {
     HTCP_CLR_PURGE,
     HTCP_CLR_INVALIDATION
 } htcp_clr_reason;
-#endif
+#endif /* USE_HTCP */
 
 #endif /* SQUID_ENUMS_H */
diff --git a/src/errorpage.h b/src/errorpage.h
index 8e739eb194..c2d49dcab9 100644
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -39,11 +39,9 @@
 #include "err_detail_type.h"
 #include "err_type.h"
 #include "ip/Address.h"
-#include "MemBuf.h"
 #include "SquidString.h"
-#if USE_AUTH
+/* auth/UserRequest.h is empty unless USE_AUTH is defined */
 #include "auth/UserRequest.h"
-#endif
 #if USE_SSL
 #include "ssl/ErrorDetail.h"
 #endif
diff --git a/src/esi/Context.h b/src/esi/Context.h
index 7b9955724a..7995c4a7d9 100644
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -36,6 +36,7 @@
 #include "esi/Element.h"
 #include "clientStream.h"
 #include "err_type.h"
+#include "HttpStatusCode.h"
 
 class ESIVarState;
 class ClientHttpRequest;
diff --git a/src/forward.h b/src/forward.h
index ee9afe9b38..d1f652a9d5 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -6,6 +6,7 @@
 #include "comm/Connection.h"
 #include "err_type.h"
 #include "fde.h"
+#include "HttpStatusCode.h"
 #include "ip/Address.h"
 #include "RefCount.h"