From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 16 Jun 2014 02:45:26 +0000 (-0600)
Subject: Change order of BSD-specific network includes so that they are properly picked up
X-Git-Tag: SQUID_3_4_6~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=077885daf8461d12886d65827e733d6a25b57ec5;p=thirdparty%2Fsquid.git

Change order of BSD-specific network includes so that they are properly picked up
---

diff --git a/acinclude/init.m4 b/acinclude/init.m4
index bf53a636bc..a6ab31c353 100644
--- a/acinclude/init.m4
+++ b/acinclude/init.m4
@@ -35,12 +35,18 @@ AC_DEFUN([SQUID_DEFAULT_INCLUDES],[[
 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 @@ SQUID_DEFAULT_INCLUDES
 #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 ===========================================================================