From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 20 Sep 2012 13:05:01 +0000 (+0200)
Subject: Shuffled some includes
X-Git-Tag: SQUID_3_3_0_1~33^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ca19e07a9502edbdec9cec4fe15459970991f8;p=thirdparty%2Fsquid.git

Shuffled some includes
Changed some linkage to c++
---

diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h
index b539181dc6..99cc6c6490 100644
--- a/src/HttpHdrCc.h
+++ b/src/HttpHdrCc.h
@@ -34,9 +34,10 @@
 
 #include "enums.h"
 #include "MemPool.h"
-#include "Packer.h"
 #include "SquidString.h"
 
+class Packer;
+
 /** Http Cache-Control header representation
  *
  * Store and parse the Cache-Control HTTP header.
diff --git a/src/HttpHdrContRange.h b/src/HttpHdrContRange.h
index 3d0fd780b3..8bfbe89727 100644
--- a/src/HttpHdrContRange.h
+++ b/src/HttpHdrContRange.h
@@ -46,15 +46,15 @@ public:
 
 /** \todo CLEANUP: Move httpHdrContRange* functions into the class methods */
 
-SQUIDCEXTERN HttpHdrContRange *httpHdrContRangeCreate(void);
-SQUIDCEXTERN HttpHdrContRange *httpHdrContRangeParseCreate(const char *crange_spec);
+HttpHdrContRange *httpHdrContRangeCreate(void);
+HttpHdrContRange *httpHdrContRangeParseCreate(const char *crange_spec);
 /** returns true if range is valid; inits HttpHdrContRange */
-SQUIDCEXTERN int httpHdrContRangeParseInit(HttpHdrContRange * crange, const char *crange_spec);
-SQUIDCEXTERN void httpHdrContRangeDestroy(HttpHdrContRange * crange);
-SQUIDCEXTERN HttpHdrContRange *httpHdrContRangeDup(const HttpHdrContRange * crange);
-SQUIDCEXTERN void httpHdrContRangePackInto(const HttpHdrContRange * crange, Packer * p);
+int httpHdrContRangeParseInit(HttpHdrContRange * crange, const char *crange_spec);
+void httpHdrContRangeDestroy(HttpHdrContRange * crange);
+HttpHdrContRange *httpHdrContRangeDup(const HttpHdrContRange * crange);
+void httpHdrContRangePackInto(const HttpHdrContRange * crange, Packer * p);
 /** inits with given spec */
-SQUIDCEXTERN void httpHdrContRangeSet(HttpHdrContRange *, HttpHdrRangeSpec, int64_t);
-SQUIDCEXTERN void httpHeaderAddContRange(HttpHeader *, HttpHdrRangeSpec, int64_t);
+void httpHdrContRangeSet(HttpHdrContRange *, HttpHdrRangeSpec, int64_t);
+void httpHeaderAddContRange(HttpHeader *, HttpHdrRangeSpec, int64_t);
 
 #endif /* SQUID_HTTPHDRCONTRANGE_H */
diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index 7fc28d00b0..1e5c108f94 100644
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -32,15 +32,19 @@
 #define SQUID_HTTPHEADER_H
 
 /* because we pass a spec by value */
-#include "HttpHeaderRange.h"
+//#include "HttpHeaderRange.h"
+#include "SquidString.h"
 /* HttpHeader holds a HttpHeaderMask */
 #include "HttpHeaderMask.h"
+#include "MemPool.h"
+
 
 /* class forward declarations */
 class HttpHdrContRange;
 class HttpHdrCc;
 class HttpHdrSc;
 class HttpHdrRange;
+class Packer;
 class String;
 class StoreEntry;
 
diff --git a/src/MemObject.h b/src/MemObject.h
index 9967a5d06d..d09f145710 100644
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -38,13 +38,15 @@
 #include "RemovalPolicy.h"
 #include "HttpRequestMethod.h"
 
+#if USE_DELAY_POOLS
+#include "DelayId.h"
+#endif
+
 typedef void STMCB (void *data, StoreIOBuffer wroteBuffer);
 
 class store_client;
 class HttpRequest;
-#if USE_DELAY_POOLS
-#include "DelayId.h"
-#endif
+class HttpReply;
 
 class MemObject
 {
diff --git a/src/Server.h b/src/Server.h
index 9918667524..818f3ccd90 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -43,6 +43,7 @@
 #endif
 
 class HttpMsg;
+class HttpReply;
 
 /**
  * ServerStateData is a common base for server-side classes such as
diff --git a/src/Store.cci b/src/Store.cci
index 9f1d46c4bb..f84e97d993 100644
--- a/src/Store.cci
+++ b/src/Store.cci
@@ -31,6 +31,7 @@
  */
 
 #include "MemObject.h"
+#include "HttpReply.h"
 
 /**
  \retval true	Store contains 0 bytes of data.
diff --git a/src/Store.h b/src/Store.h
index 04c182d331..8f8ad12bb4 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -37,6 +37,7 @@
 
 #include "comm/forward.h"
 #include "CommRead.h"
+#include "HttpReply.h"
 #include "HttpRequestMethod.h"
 #include "Packer.h"
 #include "Range.h"
diff --git a/src/client_side_request.h b/src/client_side_request.h
index a296e7a135..fda3b7e2d3 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -36,6 +36,7 @@
 #include "AccessLogEntry.h"
 #include "dlink.h"
 #include "base/AsyncJob.h"
+#include "HttpHeaderRange.h"
 
 #if USE_ADAPTATION
 #include "adaptation/forward.h"
diff --git a/src/esi/VarState.h b/src/esi/VarState.h
index 40faef0545..4101d3d08e 100644
--- a/src/esi/VarState.h
+++ b/src/esi/VarState.h
@@ -37,6 +37,8 @@
 #include "Array.h"
 #include "HttpHeader.h"
 
+class HttpReply;
+
 /* esi variable replacement logic */
 
 typedef enum {