change some methods to C++ linkage, move debugObj prototype to tools.h

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index aab40594b715265a0b213bb9c447f046b0d2aef9..db2c6db82c5b7d21dbd228f1a0b35ceb2e47caa4 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -71,6 +71,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "tools.h"
 #include "URL.h"
 #include "wordlist.h"
 #if USE_AUTH

diff --git a/src/client_side_request.h b/src/client_side_request.h
index c1bfd29a7aa8465780aba5af25b487500ef04218..3285aaecac8462a7062adabf7cfeabb3409714fe 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -200,17 +200,16 @@ private:
 };
 
 /* client http based routines */
-SQUIDCEXTERN char *clientConstructTraceEcho(ClientHttpRequest *);
+extern char *clientConstructTraceEcho(ClientHttpRequest *);
 
 class ACLFilledChecklist;
-SQUIDCEXTERN ACLFilledChecklist *clientAclChecklistCreate(const acl_access * acl,ClientHttpRequest * http);
-SQUIDCEXTERN int clientHttpRequestStatus(int fd, ClientHttpRequest const *http);
-SQUIDCEXTERN void clientAccessCheck(ClientHttpRequest *);
+extern ACLFilledChecklist *clientAclChecklistCreate(const acl_access * acl,ClientHttpRequest * http);
+extern int clientHttpRequestStatus(int fd, ClientHttpRequest const *http);
+extern void clientAccessCheck(ClientHttpRequest *);
 
 /* ones that should be elsewhere */
-SQUIDCEXTERN void redirectStart(ClientHttpRequest *, RH *, void *);
-
-SQUIDCEXTERN void tunnelStart(ClientHttpRequest *, int64_t *, int *);
+extern void redirectStart(ClientHttpRequest *, RH *, void *);
+extern void tunnelStart(ClientHttpRequest *, int64_t *, int *);
 
 #if _USE_INLINE_
 #include "Store.h"

diff --git a/src/protos.h b/src/protos.h
index d0da45df80aac6f35f20b117902ee70b56b94691..3292f79d69f0cf6ce0b102b73f5019e2985f62c0 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -51,13 +51,6 @@ class HttpRequestMethod;
 class ClientInfo;
 #endif
 
-
-//extern void clientAccessCheck(void *);
-
-
-/* packs, then prints an object using debugs() */
-SQUIDCEXTERN void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
-
 /* disk.c */
 SQUIDCEXTERN int file_open(const char *path, int mode);
 SQUIDCEXTERN void file_close(int fd);

diff --git a/src/tools.h b/src/tools.h
index d1ac242999cc986eb52546c7bf34e8e321d88838..49eb7edb12d7e85a7679b63080c594cd88d2fd71 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -45,4 +45,8 @@ extern int getMyPort(void);
 extern void setUmask(mode_t mask);
 extern void strwordquote(MemBuf * mb, const char *str);
 
+/* packs, then prints an object using debugs() */
+extern void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
+
+
 #endif /* SQUID_TOOLS_H_ */