------------------------------------------------------------
revno: 11810
revision-id: squid3@treenet.co.nz-20130427023633-416l6sbqa02hyaw2
parent: squid3@treenet.co.nz-20130426041214-difekeq21w1kgsqf
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Fri 2013-04-26 20:36:33 -0600
message:
  Fix enter_suid/leave_suid build errors in ip/Intercept.cc
  
   Intercept.cc:210: error: 'enter_suid' was not declared in this scope
   Intercept.cc:217: error: 'leave_suid' was not declared in this scope
  
  We should just be including tools.h, but on some GCC the src/tools.h and
  src/ip/tools.h include locations clash when building inside src/ip/.
  For now we must reference the src/tools.h by its long path.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130427023633-416l6sbqa02hyaw2
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 89e72ea5b785bed3b23c85ec5ac652d41d800ba3
# timestamp: 2013-04-27 02:36:54 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20130426041214-\
#   difekeq21w1kgsqf
# 
# Begin patch
=== modified file 'src/ip/Intercept.cc'
--- src/ip/Intercept.cc	2012-02-05 06:09:46 +0000
+++ src/ip/Intercept.cc	2013-04-27 02:36:33 +0000
@@ -34,6 +34,7 @@
 #include "comm/Connection.h"
 #include "ip/Intercept.h"
 #include "fde.h"
+#include "src/tools.h"
 
 #if IPF_TRANSPARENT