------------------------------------------------------------
revno: 13144
revision-id: squid3@treenet.co.nz-20140616024526-1l15nbuq1m7ustu1
parent: squid3@treenet.co.nz-20140603071254-49khv9tzfimbccjk
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sun 2014-06-15 20:45:26 -0600
message:
  Change order of BSD-specific network includes so that they are properly picked up
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140616024526-1l15nbuq1m7ustu1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: a5b7334fe645c2bff6e5cf867b45e4c75843d026
# timestamp: 2014-06-16 02:49:45 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140603071254-\
#   49khv9tzfimbccjk
# 
# Begin patch
=== modified file 'acinclude/init.m4'
--- acinclude/init.m4	2010-08-02 18:55:10 +0000
+++ acinclude/init.m4	2014-06-16 02:45:26 +0000
@@ -35,12 +35,18 @@
 dnl *BSD net headers
 AC_DEFUN([SQUID_BSDNET_INCLUDES],[
 SQUID_DEFAULT_INCLUDES
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#if HAVE_NET_IF_H
+#include <net/if.h>
+#endif
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -50,15 +56,9 @@
 #if HAVE_NETINET_IP_COMPAT_H
 #include <netinet/ip_compat.h>
 #endif
-#if HAVE_NET_IF_H
-#include <net/if.h>
-#endif
 #if HAVE_NETINET_IP_FIL_H
 #include <netinet/ip_fil.h>
 #endif
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 ])
 
 dnl ===========================================================================