From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 4 Sep 2012 11:26:41 +0000 (+0200)
Subject: Moved SquidConfig2 class to SquidConfig.h
X-Git-Tag: sourceformat-review-1~6^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7957fca15c4a57d3b4c134c80bcd0a4a42ab8b3e;p=thirdparty%2Fsquid.git

Moved SquidConfig2 class to SquidConfig.h
---

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 88fc205471..96f63203f3 100644
--- 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 26df25c2f6..0518bb68d7 100644
--- 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;