------------------------------------------------------------
revno: 12501
revision-id: squid3@treenet.co.nz-20130225034725-0m3h1qkxwtww2smw
parent: squid3@treenet.co.nz-20130225034409-tl85ubetyqgb2lpl
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3794
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sun 2013-02-24 20:47:25 -0700
message:
  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.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130225034725-0m3h1qkxwtww2smw
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 8646a4560e41c25698e150c9ff2f1a5574aeee74
# timestamp: 2013-02-25 03:50:08 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130225034409-\
#   tl85ubetyqgb2lpl
# 
# Begin patch
=== modified file 'src/acl/DomainData.cc'
--- src/acl/DomainData.cc	2012-09-22 06:39:55 +0000
+++ src/acl/DomainData.cc	2013-02-25 03:47:25 +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'
--- src/acl/Url.cc	2012-09-01 14:38:36 +0000
+++ src/acl/Url.cc	2013-02-25 03:47:25 +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)