[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    /bzr/squid3/trunk/ r12705: MacOS: workaround compiler errors and case-insensitivity
From:       Amos Jeffries <squid3 () treenet ! co ! nz>
Date:       2013-02-24 7:26:26
Message-ID: 20130224073503.94229.qmail () squid-cache ! org
[Download RAW message or body]

--===============1202181389==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------
revno: 12705
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sun 2013-02-24 00:26:26 -0700
message:
  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.
modified:
  src/acl/DomainData.cc
  src/acl/Url.cc

--===============1202181389==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; name="r12705.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'src/acl/DomainData.cc'
--- a/src/acl/DomainData.cc	2012-09-22 06:39:55 +0000
+++ b/src/acl/DomainData.cc	2013-02-24 07:26:26 +0000
@@ -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

=== modified file 'src/acl/Url.cc'
--- a/src/acl/Url.cc	2013-01-27 17:35:07 +0000
+++ b/src/acl/Url.cc	2013-02-24 07:26:26 +0000
@@ -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, ACLFlags &)


--===============1202181389==--
[prev in list] [next in list] [prev in thread] [next in thread]