------------------------------------------------------------
revno: 11733
revision-id: squid3@treenet.co.nz-20121130134025-nbg1z5nfgae82ogy
parent: squid3@treenet.co.nz-20121130133838-mcylzju1alj6k2x1
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Fri 2012-11-30 06:40:25 -0700
message:
  Fix accept_filter on Linux
  
  accept_filter directive on Linux requires TCP_DEFER_ACCEPT which
  in turn requires netinet/tcp.h. This was removed when splitting comm
  into libcomm.la.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121130134025-nbg1z5nfgae82ogy
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 06bbb4812c6bef6a83946dcb3fdcd543acbd2052
# timestamp: 2012-11-30 13:41:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121130133838-\
#   mcylzju1alj6k2x1
# 
# Begin patch
=== modified file 'src/comm/TcpAcceptor.cc'
--- src/comm/TcpAcceptor.cc	2012-03-03 23:19:03 +0000
+++ src/comm/TcpAcceptor.cc	2012-11-30 13:40:25 +0000
@@ -46,10 +46,12 @@
 #include "SquidTime.h"
 #include "StatCounters.h"
 
-namespace Comm
-{
-CBDATA_CLASS_INIT(TcpAcceptor);
-};
+#ifdef HAVE_NETINET_TCP_H
+// required for accept_filter to build.
+#include <netinet/tcp.h>
+#endif
+
+CBDATA_NAMESPACED_CLASS_INIT(Comm, TcpAcceptor);
 
 Comm::TcpAcceptor::TcpAcceptor(const Comm::ConnectionPointer &newConn, const char *note, const Subscription::Pointer &aSub) :
         AsyncJob("Comm::TcpAcceptor"),