Windows port: Renamed src/acl/Ident.h to src/acl/AclIdent.h

This fix a build failure caused by a name case conflict with src/ident.h.

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index f4d735bdbe81ae0f89c1de1d8d3a6053351253a8..e2136861b61294a60705cf336da06edfedfaffcf 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -25,7 +25,7 @@
 #include "acl/HttpReqHeader.h"
 #include "acl/HttpStatus.h"
 #if USE_IDENT
-#include "acl/Ident.h"
+#include "acl/AclIdent.h"
 #endif
 #include "acl/IntRange.h"
 #include "acl/Ip.h"

diff --git a/src/acl/Ident.h b/src/acl/AclIdent.h
similarity index 100%
rename from src/acl/Ident.h
rename to src/acl/AclIdent.h

diff --git a/src/acl/Ident.cc b/src/acl/Ident.cc
index 4753b8f433b183f932fd95a9caf5eb2ac43170fd..bda9cc1ae0941fbcefcfd3f5b05ee1e546fd558d 100644 (file)
--- a/src/acl/Ident.cc
+++ b/src/acl/Ident.cc
@@ -35,7 +35,7 @@
  */
 
 #include "squid.h"
-#include "acl/Ident.h"
+#include "acl/AclIdent.h"
 #include "acl/FilledChecklist.h"
 #include "acl/RegexData.h"
 #include "acl/UserData.h"

diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am
index 728563d0ea84330452ebba1b210455f7a5ca9268..4c71e9d72c7b46c29dad65e43f580264b4fa82ef 100644 (file)
--- a/src/acl/Makefile.am
+++ b/src/acl/Makefile.am
@@ -133,7 +133,7 @@ endif
 EXTRA_libacls_la_SOURCES += $(ARP_ACLS)
 
 
-IDENT_ACLS = Ident.cc Ident.h
+IDENT_ACLS = Ident.cc AclIdent.h
 
 if ENABLE_IDENT
 libacls_la_SOURCES += $(IDENT_ACLS)

diff --git a/src/external_acl.cc b/src/external_acl.cc
index afed604bb83686e3e87e73204fe99530981693a5..72835d0e15b1b398946d9f040feb6d36f5f35b42 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -51,7 +51,7 @@
 #include "acl/FilledChecklist.h"
 #include "acl/Acl.h"
 #if USE_IDENT
-#include "acl/Ident.h"
+#include "acl/AclIdent.h"
 #endif
 #include "client_side.h"
 #include "HttpRequest.h"