From: hno <>
Date: Fri, 1 Jun 2001 12:51:16 +0000 (+0000)
Subject: Data must be declared in place, forward declarations cannot be used
X-Git-Tag: SQUID_3_0_PRE1~1500
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0e7d2d5952b7cf2c42bb98bf7bc74062613bcd8;p=thirdparty%2Fsquid.git

Data must be declared in place, forward declarations cannot be used
in a portable manner.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 6e90c0fd29..f9557b1c89 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.382 2001/05/27 23:33:31 hno Exp $
+ * $Id: cache_cf.cc,v 1.383 2001/06/01 06:51:16 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -55,7 +55,14 @@ static const char *const B_MBYTES_STR = "MB";
 static const char *const B_GBYTES_STR = "GB";
 
 static const char *const list_sep = ", \t\n\r";
-static struct cache_dir_option common_cachedir_options[];
+
+static struct cache_dir_option common_cachedir_options[] =
+{
+    {"read-only", parse_cachedir_option_readonly, dump_cachedir_option_readonly},
+    {"max-size", parse_cachedir_option_maxsize, dump_cachedir_option_maxsize},
+    {NULL, NULL}
+};
+
 
 static void update_maxobjsize(void);
 static void configDoConfigure(void);
@@ -1143,13 +1150,6 @@ dump_cachedir_option_maxsize(StoreEntry * e, const char *option, SwapDir * sd)
 	storeAppendPrintf(e, " %s=%d", option, sd->max_objsize);
 }
 
-static struct cache_dir_option common_cachedir_options[] =
-{
-    {"read-only", parse_cachedir_option_readonly, dump_cachedir_option_readonly},
-    {"max-size", parse_cachedir_option_maxsize, dump_cachedir_option_maxsize},
-    {NULL, NULL}
-};
-
 void
 parse_cachedir_options(SwapDir * sd, struct cache_dir_option *options, int reconfiguring)
 {