From c9c46c8bcdad822e65a54516f16fe4b7a3c0d680 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 24 Feb 2013 00:26:26 -0700 Subject: [PATCH] MacOS: workaround compiler errors and case-insensitivity MacOS GCC version implicitly searches the local directory for .h includes despite the absence of -I. in the provided options. Furthermore it searches with case-insensitive filenames due to the underlying case-insensitive filesystem. The combined result is that libacl .cc files include their local copy of acl/Url.h instead of the base directories src/URL.h which was needed. The long term fix will be to shuffle URL.h and its related code into a convenience library. For now we can avoid issues by prefixing the full src/ path to the includes. --- src/acl/DomainData.cc | 2 +- src/acl/Url.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc index 3d5aa33eed..98716b89fd 100644 --- a/src/acl/DomainData.cc +++ b/src/acl/DomainData.cc @@ -38,7 +38,7 @@ #include "cache_cf.h" #include "Debug.h" #include "wordlist.h" -#include "URL.h" +#include "src/URL.h" template inline void diff --git a/src/acl/Url.cc b/src/acl/Url.cc index e4d12d4cb0..ca47794c10 100644 --- a/src/acl/Url.cc +++ b/src/acl/Url.cc @@ -37,7 +37,7 @@ #include "acl/Checklist.h" #include "acl/RegexData.h" #include "rfc1738.h" -#include "URL.h" +#include "src/URL.h" int ACLUrlStrategy::match (ACLData * &data, ACLFilledChecklist *checklist, ACLFlags &) -- 2.47.2