Summary: Rename Config.h to not conflict on case-insensitive systems.

Keywords:

Rename Config.h to not conflict on case-insensitive systems.

diff --git a/src/Config.h b/src/ConfigParser.h
similarity index 90%
rename from src/Config.h
rename to src/ConfigParser.h
index cb35da60c6dc30a01ee25dd3a228f4414da2b7e0..78cd412bcc5c0cf7c67ef844e67d1d06019f5303 100644 (file)
--- a/src/Config.h
+++ b/src/ConfigParser.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Config.h,v 1.2 2003/02/21 22:50:05 robertc Exp $
+ * $Id: ConfigParser.h,v 1.1 2003/03/08 09:43:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -33,8 +33,8 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#ifndef SQUID_CONFIG_H_
-#define SQUID_CONFIG_H_
+#ifndef SQUID_CONFIGPARSER_H_
+#define SQUID_CONFIGPARSER_H_
 
 class ConfigParser
 {
@@ -43,4 +43,4 @@ public:
     static void ParseUShort(u_short *var);
 };
 
-#endif /* SQUID_CONFIG_H_ */
+#endif /* SQUID_CONFIGPARSER_H_ */

diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc
index a1c6102bd803e10bd2855c7fcd85d33e9f2cd5f5..fb83dff087baaca40bef07be18a48082d309ef5f 100644 (file)
--- a/src/DelayBucket.cc
+++ b/src/DelayBucket.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayBucket.cc,v 1.3 2003/02/21 22:50:05 robertc Exp $
+ * $Id: DelayBucket.cc,v 1.4 2003/03/08 09:43:49 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -51,7 +51,7 @@
 #include "client_side_request.h"
 #include "ACLChecklist.h"
 #include "ACL.h"
-#include "Config.h"
+#include "ConfigParser.h"
 #include "DelayId.h"
 #include "Array.h"
 #include "String.h"

diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc
index 334fe5c5f90b6de9cd2267ee0f584eaa3fa8c52f..9618c5bce4b94cd01d5a21855e3372b9b22e92a1 100644 (file)
--- a/src/DelayConfig.cc
+++ b/src/DelayConfig.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayConfig.cc,v 1.4 2003/02/21 22:50:05 robertc Exp $
+ * $Id: DelayConfig.cc,v 1.5 2003/03/08 09:43:49 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -42,7 +42,7 @@
 #if DELAY_POOLS
 #include "squid.h"
 #include "DelayConfig.h"
-#include "Config.h"
+#include "ConfigParser.h"
 #include "DelayPools.h"
 #include "DelayPool.h"
 #include "Store.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index f2a3061269fd25edde0af8d0024a1d8d21c9fecb..98cf3ab20185f450bf7a1731034b24ae806ac9ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.63 2003/03/04 01:40:25 robertc Exp $
+#  $Id: Makefile.am,v 1.64 2003/03/08 09:43:49 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -258,7 +258,7 @@ squid_SOURCES = \
        comm_kqueue.cc \
        comm_epoll.cc \
        CommRead.h \
-       Config.h \
+       ConfigParser.h \
        ConnectionDetail.h \
        debug.cc \
        Debug.h \

diff --git a/src/Makefile.in b/src/Makefile.in
index 4abba5169a2d98d799938fb02a5b9aaf90fb0d61..96a593f0420c95043de2b4d6e1ab311da3e6d675 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.296 2003/03/04 01:46:36 robertc Exp $
+#  $Id: Makefile.in,v 1.297 2003/03/08 09:43:49 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -347,7 +347,7 @@ squid_SOURCES = \
        comm_kqueue.cc \
        comm_epoll.cc \
        CommRead.h \
-       Config.h \
+       ConfigParser.h \
        ConnectionDetail.h \
        debug.cc \
        Debug.h \

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index b3a5c2f2306cc0aae7d29d03c20a7aa3e98b6c5b..aeaeae1ac2a482a25534fbdd34aa41e09880e630 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.436 2003/02/25 15:07:53 hno Exp $
+ * $Id: cache_cf.cc,v 1.437 2003/03/08 09:43:49 robertc Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -37,7 +37,7 @@
 #include "authenticate.h"
 #include "Store.h"
 #include "SwapDir.h"
-#include "Config.h"
+#include "ConfigParser.h"
 #include "ACL.h"
 
 #if SQUID_SNMP

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 1dbed06320c58ec8d3159eb2de89b90b2994d15c..8f096dc6ccccdc00279a1faa6544e3e7e33ecf22 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: delay_pools.cc,v 1.37 2003/03/06 11:51:55 robertc Exp $
+ * $Id: delay_pools.cc,v 1.38 2003/03/08 09:43:50 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -47,7 +47,7 @@
 #include "Store.h"
 #include "MemObject.h"
 #include "client_side_request.h"
-#include "Config.h"
+#include "ConfigParser.h"
 #include "DelayId.h"
 #include "Array.h"
 #include "SquidString.h"