Moved some prototypes to tools.h

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index dfbc34998d61e8a0c767a64709296ae15f1c77da..f8583f8cfd99598f524e1c5604f363948b8dd4ad 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -50,6 +50,7 @@
 #include "rfc3596.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "tools.h"
 #include "util.h"
 #include "wordlist.h"
 

diff --git a/src/neighbors.cc b/src/neighbors.cc
index cea6adf9880342260578dc9cdf833ace6b994a17..5b722b8d43df86892fdaa0a8884446ac5fa286d8 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -58,6 +58,7 @@
 #include "stat.h"
 #include "Store.h"
 #include "store_key_md5.h"
+#include "tools.h"
 #include "URL.h"
 
 /* count mcast group peers every 15 minutes */

diff --git a/src/protos.h b/src/protos.h
index 567020ea488430ab5a501fabbbdbb8f5c18f6695..64c305a34157a4ca5fc35e0b3331f54a3bedcba0 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -88,8 +88,6 @@ extern void reconfigure(int);
 
 class store_client;
 
-SQUIDCEXTERN const char *getMyHostname(void);
-SQUIDCEXTERN const char *uniqueHostname(void);
 SQUIDCEXTERN void safeunlink(const char *path, int quiet);
 
 #include "fatal.h"

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 6b828da3db284244b66deb6d834ae9e592854de8..97d0e4139c4c8198314220501187d7bf9d9e2966 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -44,6 +44,7 @@
 #include "SquidTime.h"
 #include "stat.h"
 #include "Store.h"
+#include "tools.h"
 
 /************************************************************************
 

diff --git a/src/tools.cc b/src/tools.cc
index 6588402c97ad0a6ba36d0d2ec1804ce904fe9581..476e8ef9f4b279dcd8dacdeee2e62e4bc19c1669 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -50,6 +50,7 @@
 #include "ipc/Coordinator.h"
 #include "ipcache.h"
 #include "protos.h"
+#include "tools.h"
 #include "SwapDir.h"
 #include "wordlist.h"
 

diff --git a/src/tools.h b/src/tools.h
index 4b5d670b8ec037f5392dbcf7e72abbafd3008f36..c8a0365e3f0b8475aaef6edd48d1118f811a4db0 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -47,4 +47,7 @@ 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);
 
+extern const char *getMyHostname(void);
+extern const char *uniqueHostname(void);
+
 #endif /* SQUID_TOOLS_H_ */

diff --git a/src/urn.cc b/src/urn.cc
index 7f2c310338a4462ca8196bd61cf91a97fb1bb1b7..df92a76af0b6cca33eed92fc171ae055785092a3 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -46,6 +46,7 @@
 #include "SquidTime.h"
 #include "Store.h"
 #include "StoreClient.h"
+#include "tools.h"
 #include "URL.h"
 #include "urn.h"