From 314c9b0365e4027ca8e1bfe1371b5baa0074919c Mon Sep 17 00:00:00 2001 From: Guido Serassio Date: Mon, 1 Jun 2009 11:08:01 +0200 Subject: [PATCH] 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. --- src/AclRegs.cc | 2 +- src/acl/{Ident.h => AclIdent.h} | 0 src/acl/Ident.cc | 2 +- src/acl/Makefile.am | 2 +- src/external_acl.cc | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/acl/{Ident.h => AclIdent.h} (100%) diff --git a/src/AclRegs.cc b/src/AclRegs.cc index f4d735bdbe..e2136861b6 100644 --- 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 4753b8f433..bda9cc1ae0 100644 --- 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 728563d0ea..4c71e9d72c 100644 --- 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 afed604bb8..72835d0e15 100644 --- 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" -- 2.47.3