svn commit: r312413 - stable/11/sys/contrib/ipfilter/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Thu Jan 19 15:27:53 2017
New Revision: 312413
URL: https://svnweb.freebsd.org/changeset/base/312413

Log:
  MFC r311950:
  
    Get rid of a compiler warning which I saw too often.
    Include netinet/in.h before ip_compat.t which will then check if
    IPPROTO_IPIP is defined or not.  Doing it the other way round,
    ip_compat.h would not find it defined and netinet/in.h then
    redefine it.

Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_fil.h	Thu Jan 19 15:06:18 2017	(r312412)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_fil.h	Thu Jan 19 15:27:53 2017	(r312413)
@@ -11,6 +11,10 @@
 #ifndef	__IP_FIL_H__
 #define	__IP_FIL_H__
 
+#if !defined(linux) || !defined(_KERNEL)
+# include <netinet/in.h>
+#endif
+
 #include "netinet/ip_compat.h"
 #include "netinet/ipf_rb.h"
 #if NETBSD_GE_REV(104040000)
@@ -24,10 +28,6 @@
 # endif
 #endif
 
-#if !defined(linux) || !defined(_KERNEL)
-# include <netinet/in.h>
-#endif
-
 #ifndef	SOLARIS
 # if defined(sun) && (defined(__svr4__) || defined(__SVR4))
 #  define	SOLARIS		1