Bug 2206: Build error caused by incorrect configure include file detection

Adds type-definitions for the *BSD family networking OS header files which
depend on them without including the necessary definition headers themselves.

Completes fix for Bug 2196 detailed files.

diff --git a/acinclude.m4 b/acinclude.m4
index 5e575d232bda1015de90b2f535c21ae203dbe557..ec8cc4bd150501a118dda9963bf6be6ee1fdf9f0 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -22,6 +22,9 @@ AC_DEFUN([SQUID_DEFAULT_INCLUDES],[[
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#if HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
 ]])     
 
 dnl and this is for AC_CHECK_SIZEOF
@@ -42,6 +45,9 @@ SQUID_DEFAULT_INCLUDES
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#if HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
 #if HAVE_NETINET_IP_COMPAT_H
 #include <netinet/ip_compat.h>
 #endif

diff --git a/include/squid_types.h b/include/squid_types.h
index 720d370b643cc41d5e66b1e12dd8a5aeb86dcc1a..4492d2ebb6f3b301f3a671aded97d440c6a31109 100644 (file)
--- a/include/squid_types.h
+++ b/include/squid_types.h
@@ -73,6 +73,10 @@
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#if HAVE_NETINET_IN_SYSTM_H
+/* Several OS require types declared by in_systm.h without including it themselves. */
+#include <netinet/in_systm.h>
+#endif
 
 /* 
  * ISO C99 Standard printf() macros for 64 bit integers