------------------------------------------------------------
revno: 13887
revision-id: squid3@treenet.co.nz-20150820134636-2d0y39b107ty3ayb
parent: squid3@treenet.co.nz-20150820134421-kye79zzutzjns33m
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4301
author: Patrick Welche <prlw1@cam.ac.uk>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2015-08-20 06:46:36 -0700
message:
  Bug 4301: compile errors with IPFilter interception
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150820134636-2d0y39b107ty3ayb
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 8d9b785fe9d774c59081bb1938e8fdaa8d266579
# timestamp: 2015-08-20 13:51:01 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150820134421-\
#   kye79zzutzjns33m
# 
# Begin patch
=== modified file 'acinclude/os-deps.m4'
--- acinclude/os-deps.m4	2015-01-13 09:13:49 +0000
+++ acinclude/os-deps.m4	2015-08-20 13:46:36 +0000
@@ -888,6 +888,7 @@
   if test "x$squid_cv_broken_ipfilter_minor_t" = "x"; then
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #     include <sys/types.h>
+#     include <sys/time.h>
 #     include <sys/ioccom.h>
 #     include <netinet/in.h>
 
@@ -902,6 +903,7 @@
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define minor_t fubaar
 #       include <sys/types.h>
+#       include <sys/time.h>
 #       include <sys/ioccom.h>
 #       include <netinet/in.h>
 #undef minor_t
@@ -912,7 +914,7 @@
         AC_MSG_RESULT(yes)
         squid_cv_broken_ipfilter_minor_t=1
       ],[
-        AC_MSG_RESULT(unable to make IPFilter work with netinet/ headers)
+        AC_MSG_ERROR(unable to make IPFilter work with netinet/ headers)
       ])
     ])
   fi
@@ -940,6 +942,9 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif