summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2017-02-11 18:10:55 +0000
committercy <cy@FreeBSD.org>2017-02-11 18:10:55 +0000
commit180753ef179b1c503f44e7625c467758dd6f3c4d (patch)
tree44fa6b5cf35a71f6bc2ba4b93cc4bcd134f369fa
parentbe2fb88bb5cf67a97a0d817e190baf58891b2b67 (diff)
downloadFreeBSD-src-180753ef179b1c503f44e7625c467758dd6f3c4d.zip
FreeBSD-src-180753ef179b1c503f44e7625c467758dd6f3c4d.tar.gz
MFC r311950 (by bz):
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.
-rw-r--r--sys/contrib/ipfilter/netinet/ip_fil.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index 01ccd1d..170cc53 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -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
OpenPOWER on IntegriCloud