Protos.h said to remove HttpRequestMethod.h #include when no method_t is used

by prototypes. Removed the header and adjusted other source files that relied
on that header being in protos.h.

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 1fec6fce6aa0722448a8af112b8bc9b5b7db7f66..f211d6de367025fc6127c6014e728d9d7e9cca4e 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AccessLogEntry.h,v 1.8 2008/01/20 08:54:28 amosjeffries Exp $
+ * $Id: AccessLogEntry.h,v 1.9 2008/02/26 00:15:48 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,6 +36,7 @@
 #define SQUID_HTTPACCESSLOGENTRY_H
 
 #include "HttpVersion.h"
+#include "HttpRequestMethod.h"
 #include "HierarchyLogEntry.h"
 #include "IPAddress.h"
 

diff --git a/src/MemObject.h b/src/MemObject.h
index 765d96b6bda180809a43f1138fc1bd2493d7dd00..63cf0f5e8af3a21533b8d07cebeebf28d89af817 100644 (file)
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MemObject.h,v 1.16 2008/01/20 08:54:28 amosjeffries Exp $
+ * $Id: MemObject.h,v 1.17 2008/02/26 00:15:48 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,6 +39,7 @@
 #include "stmem.h"
 #include "CommRead.h"
 #include "RemovalPolicy.h"
+#include "HttpRequestMethod.h"
 
 typedef void STMCB (void *data, StoreIOBuffer wroteBuffer);
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 959e2d5f17d844dab14d0a937ee6413b9022ba0a..12aff3d64c76979b303b8034418a877f25cf0f97 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.542 2008/02/17 09:24:50 serassio Exp $
+ * $Id: cache_cf.cc,v 1.543 2008/02/26 00:15:48 rousskov Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "authenticate.h"
 #include "ProtoPort.h"
+#include "HttpRequestMethod.h"
 #include "AuthConfig.h"
 #include "AuthScheme.h"
 #include "CacheManager.h"

diff --git a/src/protos.h b/src/protos.h
index 0e1e76ed3d2393984ec05ea7069f304e4f07304e..49a9b32f87cdfd7d6f000b11d4d23cc772a7bc16 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.555 2008/02/07 02:51:18 adrian Exp $
+ * $Id: protos.h,v 1.556 2008/02/26 00:15:48 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -38,15 +38,13 @@
  * yet.
  */
 #include "Packer.h"
-/* for routines that have not moved out their proper homes yet.
- * grep for method_t in this file - if none found remove this include.
- */
-#include "HttpRequestMethod.h"
 /* for routines still in this file that take CacheManager parameters */
 #include "IPAddress.h"
-/* for routines in here that need it as a parameter. */
+
 
 class CacheManager;
+class HttpRequestMethod;
+
 
 #if FORW_VIA_DB
 SQUIDCEXTERN void fvdbCountVia(const char *key);