------------------------------------------------------------
revno: 12525
revision-id: squid3@treenet.co.nz-20130402124212-711cndqpa1gnidpz
parent: squid3@treenet.co.nz-20130402040735-33nh1s6y98cu2519
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2013-04-02 06:42:12 -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-20130402124212-711cndqpa1gnidpz
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 2ec0c9d43420a54d4e5b4ae2d6c5ee4740648dbc
# timestamp: 2013-04-02 12:42:27 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130402040735-\
#   33nh1s6y98cu2519
# 
# Begin patch
=== modified file 'src/ip/Intercept.cc'
--- src/ip/Intercept.cc	2013-04-02 04:07:35 +0000
+++ src/ip/Intercept.cc	2013-04-02 12:42:12 +0000
@@ -34,6 +34,7 @@
 #include "comm/Connection.h"
 #include "ip/Intercept.h"
 #include "fde.h"
+#include "src/tools.h"
 
 #if IPF_TRANSPARENT