From 8d03bdb45f7c2f84632c8a0380e7d58782d02180 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Thu, 30 Aug 2012 12:54:54 +0200 Subject: [PATCH] Moved some prototypes to tools.h --- src/dns_internal.cc | 1 + src/neighbors.cc | 1 + src/protos.h | 2 -- src/snmp_agent.cc | 1 + src/tools.cc | 1 + src/tools.h | 3 +++ src/urn.cc | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/dns_internal.cc b/src/dns_internal.cc index dfbc34998d..f8583f8cfd 100644 --- 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 cea6adf988..5b722b8d43 100644 --- 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 567020ea48..64c305a341 100644 --- 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 6b828da3db..97d0e4139c 100644 --- 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 6588402c97..476e8ef9f4 100644 --- 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 4b5d670b8e..c8a0365e3f 100644 --- 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 7f2c310338..df92a76af0 100644 --- 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" -- 2.47.2