Moved external ACL protos from protos.h to ExternalACL.h

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index be5e0cabe7fb03a3e7a6a206213fb7837f9739b2..c341f69f9c032b69193d5165a9858e44c0a32b06 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -94,4 +94,16 @@ 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 **);
+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);
+
+
 #endif /* SQUID_EXTERNALACL_H */

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index ab0e0ec360d165b9d354b50b2a7b05a74226261a..7d1dfc89595f020bcb27fd6a9ea777746b57c02a 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -42,6 +42,7 @@
 #include "CpuAffinityMap.h"
 #include "DiskIO/DiskIOModule.h"
 #include "eui/Config.h"
+#include "ExternalACL.h"
 #include "format/Format.h"
 #include "globals.h"
 #include "HttpRequestMethod.h"

diff --git a/src/protos.h b/src/protos.h
index 95f505143827a7c700c47bc63435d4c97d6c8377..194e94597d4d0f6508477001d9f4ade90a80bd69 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -555,24 +555,7 @@ class StatCounters;
 
 #endif
 
-    /* external_acl.c */
-    class external_acl;
-            SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
-
-            SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
-
-            SQUIDCEXTERN void free_externalAclHelper(external_acl **);
-
-            typedef void EAH(void *data, void *result);
-            class ACLChecklist;
-                SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
-
-                SQUIDCEXTERN void externalAclInit(void);
-
-                SQUIDCEXTERN void externalAclShutdown(void);
-
-                SQUIDCEXTERN char *strtokFile(void);
-
+extern char *strtokFile(void);
 
 #if USE_AUTH