From: robertc <>
Date: Sun, 2 Feb 2003 20:12:36 +0000 (+0000)
Subject: Summary: String.h collided with system string.h on case-insensitive file systems.
X-Git-Tag: SQUID_3_0_PRE1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf414c2d7407d23f854419739ba52ec2b50fc7dc;p=thirdparty%2Fsquid.git

Summary: String.h collided with system string.h on case-insensitive file systems.
Keywords:

String.h collided with system string.h on case-insensitive file systems.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1cc6c818d1..7b4e1004b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.52 2003/01/28 01:29:32 robertc Exp $
+#  $Id: Makefile.am,v 1.53 2003/02/02 13:12:36 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -275,7 +275,7 @@ noinst_HEADERS = MemBuf.cci \
 	MemBuf.h \
 	Store.cci \
 	String.cci \
-	String.h \
+	SquidString.h \
 	ufscommon.cci 
 
 nodist_squid_SOURCES = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 55b9dc8012..a8ed2d3d03 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.274 2003/02/02 13:01:42 robertc Exp $
+#  $Id: Makefile.in,v 1.275 2003/02/02 13:12:36 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -367,7 +367,7 @@ noinst_HEADERS = MemBuf.cci \
 	MemBuf.h \
 	Store.cci \
 	String.cci \
-	String.h \
+	SquidString.h \
 	ufscommon.cci 
 
 
diff --git a/src/structs.h b/src/structs.h
index 71386da834..f8c8e6052a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.444 2003/01/28 01:29:35 robertc Exp $
+ * $Id: structs.h,v 1.445 2003/02/02 13:12:36 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -699,7 +699,7 @@ struct _HttpBody {
     MemBuf mb;
 };
 
-#include "String.h"
+#include "SquidString.h"
 /* http header extention field */
 struct _HttpHdrExtField {
     String name;		/* field-name  from HTTP/1.1 (no column after name) */