From 56082504a29826b27f1629ce5e59ddde73b38ee1 Mon Sep 17 00:00:00 2001
From: wessels <>
Date: Fri, 25 Oct 1996 05:29:37 +0000
Subject: [PATCH] make null_string global in main.o

---
 src/cache_cf.cc | 3 +--
 src/main.cc     | 5 +++--
 src/squid.h     | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index c1e016f2b3..be22dd6e06 100644
--- 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 e5ede43b74..dc4aac6d07 100644
--- 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 157e55ae1f..db704b99f3 100644
--- 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[];
-- 
2.47.2