------------------------------------------------------------
revno: 12293
revision-id: squid3@treenet.co.nz-20120816071105-si2wfvi4d1tw7h05
parent: kinkie@squid-cache.org-20120815201357-ksj9rffnqrszar2w
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Thu 2012-08-16 01:11:05 -0600
message:
  Fix ip/Intercept header ordering and documentation
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120816071105-si2wfvi4d1tw7h05
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 459d7ab0c65a4f99225a36f3d53fe848b97ba1ad
# timestamp: 2012-08-16 07:20:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120815201357-\
#   ksj9rffnqrszar2w
# 
# Begin patch
=== modified file 'src/ip/Intercept.cc'
--- src/ip/Intercept.cc	2012-08-15 20:13:57 +0000
+++ src/ip/Intercept.cc	2012-08-16 07:11:05 +0000
@@ -89,13 +89,14 @@
 #include <net/pfvar.h>
 #endif /* HAVE_NET_PFVAR_H */
 #endif /* PF_TRANSPARENT required headers */
+
+#if LINUX_NETFILTER
+#if HAVE_LIMITS_H
 /* must be before including netfilter_ipv4.h */
-#if HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#if LINUX_NETFILTER
 #include <linux/netfilter_ipv4.h>
-#endif
+#endif /* LINUX_NETFILTER required headers */
 
 // single global instance for access by other components.
 Ip::Intercept Ip::Interceptor;