make null_string global in main.o

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index c1e016f2b35ded592f1efd52778a2fe4c21f665f..be22dd6e06eca67ffd28c15b26b77121603eebaf 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.115 1996/10/24 23:18:17 wessels Exp $
+ * $Id: cache_cf.cc,v 1.116 1996/10/24 23:29:37 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -207,7 +207,6 @@ char *cfg_filename = NULL;  /* just the last part */
 char ForwardedBy[256];
 
 char w_space[] = " \t\n";
-static char null_string[] = "";
 char config_input_line[BUFSIZ];
 int config_lineno = 0;
 

diff --git a/src/main.cc b/src/main.cc
index e5ede43b74dbadcb89f7054e799b26b0ee786db4..dc4aac6d0731823a9a5c28c01d0efbdc490293d3 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: main.cc,v 1.103 1996/10/24 23:18:23 wessels Exp $
+ * $Id: main.cc,v 1.104 1996/10/24 23:29:39 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -130,7 +130,8 @@ char version_string[] = SQUID_VERSION;
 char appname[] = "squid";
 char localhost[] = "127.0.0.1";
 struct in_addr local_addr;
-char *dash_str = "-";
+char dash_str[] = "-";
+char null_string[] = "";
 
 /* for error reporting from xmalloc and friends */
 extern void (*failure_notify) _PARAMS((char *));

diff --git a/src/squid.h b/src/squid.h
index 157e55ae1f8cc1a3de66e1a516c4ab4456f6a829..db704b99f3c5bddc1772764d3a9db484f53dc036 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.61 1996/10/19 07:08:37 wessels Exp $
+ * $Id: squid.h,v 1.62 1996/10/24 23:29:40 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -306,4 +306,5 @@ extern void ttlAddToList _PARAMS((char *, int, int, time_t, int, time_t));
 extern void ttlAddToForceList _PARAMS((char *, time_t, time_t));
 extern int waisStart _PARAMS((int, char *, method_t, char *, StoreEntry *));
 extern void storeDirClean _PARAMS((void));
-extern char *dash_str;
+extern char dash_str[];
+extern char null_string[];