From 685c6ff522ef6e72215d37ff2f68a9cf2614ba0d Mon Sep 17 00:00:00 2001
From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 21 Aug 2012 15:25:17 +0200
Subject: [PATCH] change some methods to C++ linkage, move debugObj prototype
 to tools.h

---
 src/client_side_request.cc |  1 +
 src/client_side_request.h  | 13 ++++++-------
 src/protos.h               |  7 -------
 src/tools.h                |  4 ++++
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index aab40594b7..db2c6db82c 100644
--- 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 c1bfd29a7a..3285aaecac 100644
--- 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 d0da45df80..3292f79d69 100644
--- 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 d1ac242999..49eb7edb12 100644
--- 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_ */
-- 
2.47.2