Add some include-protection to IPInterception.cc

diff --git a/configure.in b/configure.in
index ae7e69e74fdbf651e3f7932c608a69024cdb8ec8..1b05ba169263880516227097a7a0dac45dc6c2fa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.482 2007/10/01 05:04:21 wessels Exp $
+dnl  $Id: configure.in,v 1.483 2007/11/07 10:20:46 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.482 $)dnl
+AC_REVISION($Revision: 1.483 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1861,11 +1861,12 @@ AC_CHECK_HEADERS( \
        math.h \
        memory.h \
        mount.h \
+       net/if.h \
        net/pfvar.h \
        netdb.h \
        netinet/in.h \
-       netinet/tcp.h \
        netinet/ip_fil_compat.h \
+       netinet/tcp.h \
        openssl/err.h \
        openssl/md5.h \
        openssl/ssl.h \

diff --git a/src/IPInterception.cc b/src/IPInterception.cc
index a37b13e2695f81803835e4aeaebc23c590e9b00e..83a9c2166749349cf5ebeeb9896c7dd151dacd7c 100644 (file)
--- a/src/IPInterception.cc
+++ b/src/IPInterception.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: IPInterception.cc,v 1.17 2007/05/20 04:22:45 adrian Exp $
+ * $Id: IPInterception.cc,v 1.18 2007/11/07 10:20:47 amosjeffries Exp $
  *
  * DEBUG: section 89    NAT / IP Interception 
  * AUTHOR: Robert Collins
@@ -42,8 +42,12 @@
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
+#if HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
+#endif
+#if HAVE_NET_IF_H
 #include <net/if.h>
+#endif
 #ifdef HAVE_IPL_H
 #include <ipl.h>
 #elif HAVE_NETINET_IPL_H