Removed some useless includes

Changed some linkage from C to default (extern c++)

diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index 465fdc159d5eed9fc3fb41baca741619c6f9889e..03baa13ba7abc6aafcd42e055979b326d788caa4 100644 (file)
--- a/src/EventLoop.cc
+++ b/src/EventLoop.cc
@@ -31,9 +31,12 @@
  */
 
 #include "squid.h"
+#include "AsyncEngine.h"
 #include "Debug.h"
 #include "EventLoop.h"
 #include "base/AsyncCallQueue.h"
+#include "SquidTime.h"
+
 
 EventLoop::EventLoop() : errcount(0), last_loop(false), timeService(NULL),
         primaryEngine(NULL)

diff --git a/src/EventLoop.h b/src/EventLoop.h
index bf1bda47449c4fd63fe2cb3bcc20cf040df852d8..63736ddd9476145c71c9cf50a6e6039ff35cd778 100644 (file)
--- a/src/EventLoop.h
+++ b/src/EventLoop.h
@@ -32,11 +32,12 @@
 #define SQUID_EVENTLOOP_H
 
 #include "Array.h"
-#include "AsyncEngine.h"
-#include "SquidTime.h"
 
 #define EVENT_LOOP_TIMEOUT     1000 /* 1s timeout */
 
+class AsyncEngine;
+class TimeEngine;
+
 /** An event loop. An event loop is the core inner loop of squid.
  * The event loop can be run until exit, or once. After it finishes control
  * returns to the caller. If desired it can be run again.

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index 8878f3e5c6ef149a0e9af64fc6a8f7be06812554..7d5e3c8a8a9b61a49ec233ad5e7512d2ebb9b4e8 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -33,8 +33,8 @@
 #define SQUID_EXTERNALACL_H
 
 #include "acl/Checklist.h"
-
 class external_acl;
+class StoreEntry;
 
 /** \todo CLEANUP: kill this typedef. */
 typedef struct _external_acl_data external_acl_data;
@@ -93,15 +93,12 @@ protected:
 
 MEMPROXY_CLASS_INLINE(ACLExternal);
 
-class ACLChecklist;
-class StoreEntry;
-
-extern void parse_externalAclHelper(external_acl **);
-extern void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
-extern void free_externalAclHelper(external_acl **);
+void parse_externalAclHelper(external_acl **);
+void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
+void free_externalAclHelper(external_acl **);
 typedef void EAH(void *data, void *result);
-extern void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
-extern void externalAclInit(void);
-extern void externalAclShutdown(void);
+void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
+void externalAclInit(void);
+void externalAclShutdown(void);
 
 #endif /* SQUID_EXTERNALACL_H */

diff --git a/src/base/AsyncCall.cc b/src/base/AsyncCall.cc
index eae5c72abfad04981b5c83e149dee00b701e31c9..4a76d76cad75eae5884982d65551962758cf261b 100644 (file)
--- a/src/base/AsyncCall.cc
+++ b/src/base/AsyncCall.cc
@@ -3,6 +3,7 @@
  */
 
 #include "squid.h"
+#include "AsyncCall.h"
 #include "base/AsyncCall.h"
 #include "base/AsyncCallQueue.h"
 #include "cbdata.h"

diff --git a/src/base/AsyncCall.h b/src/base/AsyncCall.h
index 409940804419716ae5583d380eded619d8eb657c..b7055645dab91684c3c15fa742c7f0c0359ea516 100644 (file)
--- a/src/base/AsyncCall.h
+++ b/src/base/AsyncCall.h
@@ -5,10 +5,9 @@
 #ifndef SQUID_ASYNCCALL_H
 #define SQUID_ASYNCCALL_H
 
-//#include "cbdata.h"
 #include "base/InstanceId.h"
 #include "event.h"
-//#include "TextException.h"
+#include "RefCount.h"
 
 /**
  \defgroup AsynCallsAPI Async-Calls API

diff --git a/src/errorpage.h b/src/errorpage.h
index c2d49dcab9b0d9da640ecaa75eec512e066b0aa9..0103f4a123118298f1909c074df744f3f1118830 100644 (file)
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -38,6 +38,7 @@
 #include "comm/forward.h"
 #include "err_detail_type.h"
 #include "err_type.h"
+#include "HttpStatusCode.h"
 #include "ip/Address.h"
 #include "SquidString.h"
 /* auth/UserRequest.h is empty unless USE_AUTH is defined */

diff --git a/src/event.h b/src/event.h
index 23e4d11bbafdb2af6315709d9dcf857b4cfd4b00..aa269292a26b21612b004852d4cb80594f397e40 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -35,9 +35,6 @@
 #include "Array.h"
 #include "AsyncEngine.h"
 #include "MemPool.h"
-#include "RefCount.h"
-
-/* forward decls */
 
 class StoreEntry;
 
@@ -45,12 +42,12 @@ class StoreEntry;
 
 typedef void EVH(void *);
 
-extern void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata=true);
-SQUIDCEXTERN void eventAddIsh(const char *name, EVH * func, void *arg, double delta_ish, int);
-SQUIDCEXTERN void eventDelete(EVH * func, void *arg);
-SQUIDCEXTERN void eventInit(void);
-SQUIDCEXTERN void eventFreeMemory(void);
-SQUIDCEXTERN int eventFind(EVH *, void *);
+void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata=true);
+void eventAddIsh(const char *name, EVH * func, void *arg, double delta_ish, int);
+void eventDelete(EVH * func, void *arg);
+void eventInit(void);
+void eventFreeMemory(void);
+int eventFind(EVH *, void *);
 
 class ev_entry
 {

diff --git a/src/fd.h b/src/fd.h
index 316f244f1d7e15d1fbdc181e1ed6d263e03f09cb..89483415637a079c1bd15e7f8f81544a0e077c99 100644 (file)
--- a/src/fd.h
+++ b/src/fd.h
@@ -33,12 +33,12 @@
 #ifndef SQUID_FD_H_
 #define SQUID_FD_H_
 
-extern void fd_close(int fd);
-extern void fd_open(int fd, unsigned int type, const char *);
-extern void fd_note(int fd, const char *);
-extern void fd_bytes(int fd, int len, unsigned int type);
-extern void fdDumpOpen(void);
-extern int fdUsageHigh(void);
-extern void fdAdjustReserved(void);
+void fd_close(int fd);
+void fd_open(int fd, unsigned int type, const char *);
+void fd_note(int fd, const char *);
+void fd_bytes(int fd, int len, unsigned int type);
+void fdDumpOpen(void);
+int fdUsageHigh(void);
+void fdAdjustReserved(void);
 
 #endif /* SQUID_FD_H_ */

diff --git a/src/htcp.h b/src/htcp.h
index 2907d3f77424e64c5f1977772f69a21d711ecf28..631d1c0f5e058d1b9ff6c6a77b851677c4f38bc4 100644 (file)
--- a/src/htcp.h
+++ b/src/htcp.h
@@ -61,10 +61,10 @@ public:
 typedef class HtcpReplyData htcpReplyData;
 
 /// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const Ip::Address &);
+void neighborsHtcpReply(const cache_key *, htcpReplyData *, const Ip::Address &);
 
 /// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void htcpOpenPorts(void);
+void htcpOpenPorts(void);
 
 /**
  * \ingroup ServerProtocolHTCP
@@ -79,16 +79,16 @@ SQUIDCEXTERN void htcpOpenPorts(void);
  *             Don't wait for a reply or count in stats as sent.
  * \retval -1   Error sending request.
  */
-SQUIDCEXTERN int htcpQuery(StoreEntry * e, HttpRequest * req, CachePeer * p);
+int htcpQuery(StoreEntry * e, HttpRequest * req, CachePeer * p);
 
 /// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void htcpClear(StoreEntry * e, const char *uri, HttpRequest * req, const HttpRequestMethod &method, CachePeer * p, htcp_clr_reason reason);
+void htcpClear(StoreEntry * e, const char *uri, HttpRequest * req, const HttpRequestMethod &method, CachePeer * p, htcp_clr_reason reason);
 
 /// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void htcpSocketShutdown(void);
+void htcpSocketShutdown(void);
 
 /// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void htcpClosePorts(void);
+void htcpClosePorts(void);
 
 #endif /* USE_HTCP */
 

diff --git a/src/http.cc b/src/http.cc
index da06ef7576b5cefd76cb81f9d1d7673cdb57a371..0122d6bf21ecec64318e5d7a54e0fb23ae8ea1f8 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -40,6 +40,7 @@
 #include "base/AsyncJobCalls.h"
 #include "base/TextException.h"
 #include "CachePeer.h"
+#include "ChunkedCodingParser.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"

diff --git a/src/http.h b/src/http.h
index 1c78faf4c398e525e5c130d9c37f16a6a6b9bf65..73b6ce8900b6414d4fc05d6eab0a73cccec799b0 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -32,12 +32,11 @@
 #ifndef SQUID_HTTP_H
 #define SQUID_HTTP_H
 
-#include "StoreIOBuffer.h"
 #include "comm.h"
-#include "comm/forward.h"
-#include "forward.h"
 #include "Server.h"
-#include "ChunkedCodingParser.h"
+
+class ChunkedCodingParser;
+class FwdState;
 
 class HttpStateData : public ServerStateData
 {

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 51c077a17c6da4b1aa180fa478e6529ea3990571..0d0ac4f956dd68bfa482f8bb886a7fcc13864f4d 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -4,8 +4,10 @@
 #include <cppunit/TestAssert.h>
 
 #include "testEventLoop.h"
+#include "AsyncEngine.h"
 #include "EventLoop.h"
 #include "Mem.h"
+#include "SquidTime.h"
 #include "stat.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );

diff --git a/src/tests/testStoreSupport.h b/src/tests/testStoreSupport.h
index dfa6025c4fe7b6d3727d47a8993482ac87a40fc3..915ac92dfe4d7c8c5587acbb4cd1248514122a56 100644 (file)
--- a/src/tests/testStoreSupport.h
+++ b/src/tests/testStoreSupport.h
@@ -35,6 +35,7 @@
 #define   SQUID_TESTSTORESUPPORT_H
 
 #include "EventLoop.h"
+#include "SquidTime.h"
 
 /* construct a stock loop with event dispatching, a time service that advances
  * 1 second a tick