From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 25 Feb 2013 03:47:25 +0000 (-0700)
Subject: Bug 3794: MacOS: workaround compiler errors and case-insensitivity
X-Git-Tag: SQUID_3_3_2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e07797948860a5a80fd244a26babe819cd9414;p=thirdparty%2Fsquid.git

Bug 3794: 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.
---

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<class T>
 inline void
diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index 1be778c3a8..88fc771c68 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<char const *> * &data, ACLFilledChecklist *checklist)