Moved HttpHeader prototypes from protos.h to HttpHeader.h

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index cf0c336a4385feaba36202b712d9f6790c50e1ce..eab50bdc4bea0a7e27bd17770a8297d88b6e4b3f 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -295,9 +295,9 @@ private:
 
 
 extern int httpHeaderParseQuotedString(const char *start, const int len, String *val);
-SQUIDCEXTERN int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
-SQUIDCEXTERN void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
-SQUIDCEXTERN void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
+extern int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
+extern void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
+extern void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
 
 inline bool
 HttpHeader::chunked() const
@@ -306,4 +306,7 @@ HttpHeader::chunked() const
            hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',');
 }
 
+extern void httpHeaderInitModule(void);
+extern void httpHeaderCleanModule(void);
+
 #endif /* SQUID_HTTPHEADER_H */

diff --git a/src/main.cc b/src/main.cc
index 1eb95962380d8d4958fde07760be364c21febcb5..8cdd7349a18dea3497d2845cb005b7d4a0d3147c 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,6 +53,7 @@
 #include "fs/Module.h"
 #include "fqdncache.h"
 #include "htcp.h"
+#include "HttpHeader.h"
 #include "HttpReply.h"
 #include "icmp/IcmpSquid.h"
 #include "icmp/net_db.h"

diff --git a/src/protos.h b/src/protos.h
index 06b93a42ec49499cddf6b8b3bd35c38c1df609da..1f627fa3353b609c33d03cc2531679ebbd638439 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -161,10 +161,6 @@ extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * rep
 
 #include "HttpStatusCode.h"
 
-class StatHist;
-
-/* Http Cache Control Header Field */
-
 /* Http Header Tools */
 class HttpHeaderFieldInfo;
 SQUIDCEXTERN HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);
@@ -182,9 +178,6 @@ SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val);
 SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
 
 
-/* Http Header */
-SQUIDCEXTERN void httpHeaderInitModule(void);
-SQUIDCEXTERN void httpHeaderCleanModule(void);
 
 /* store report about current header usage and other stats */
 void httpHeaderStoreReport(StoreEntry * e);

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index b87ee3c32afc7ca738518da62f570e1ef70f15fb..3b02f4a77dd7ecf31ba912d2b545e104ed51a118 100644 (file)
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -3,6 +3,7 @@
 #include <cppunit/TestAssert.h>
 
 #include "testHttpReply.h"
+#include "HttpHeader.h"
 #include "HttpReply.h"
 #include "Mem.h"
 #include "protos.h"

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 8197634aad12aebb4baff58a9414ad0c01a884c5..4e4d60d5b5be1f0882a25687b000ebde18d32b87 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -4,6 +4,7 @@
 #include <cppunit/TestAssert.h>
 
 #include "testHttpRequest.h"
+#include "HttpHeader.h"
 #include "HttpRequest.h"
 #include "Mem.h"
 #include "protos.h"