Moved SquidConfig2 class to SquidConfig.h

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 88fc2054711fd7db6aebf08eadb4a25d6c6b7094..96f63203f376d3b77f257b78a64f6450a32ab883 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -534,4 +534,16 @@ public:
 
 extern SquidConfig Config;
 
+
+struct SquidConfig2 {
+    struct {
+        int enable_purge;
+        int mangle_request_headers;
+    } onoff;
+    uid_t effectiveUserID;
+    gid_t effectiveGroupID;
+};
+
+extern SquidConfig2 Config2;
+
 #endif /* SQUID_SQUIDCONFIG_H_ */

diff --git a/src/structs.h b/src/structs.h
index 26df25c2f6dcbce39ca002d1d0045beee2177039..0518bb68d794481c462ab7506b6b8d6fe5622aac 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -146,17 +146,6 @@ struct PortCfg;
 }
 class SwapDir;
 
-struct SquidConfig2 {
-    struct {
-        int enable_purge;
-        int mangle_request_headers;
-    } onoff;
-    uid_t effectiveUserID;
-    gid_t effectiveGroupID;
-};
-
-SQUIDCEXTERN SquidConfig2 Config2;
-
 class close_handler {
 public:
     PF *handler;