Date: Sat, 11 Feb 2017 18:10:55 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r313648 - stable/10/sys/contrib/ipfilter/netinet Message-ID: <201702111810.v1BIAtHZ098942@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sat Feb 11 18:10:55 2017 New Revision: 313648 URL: https://svnweb.freebsd.org/changeset/base/313648 Log: 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. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil.h ============================================================================== --- stable/10/sys/contrib/ipfilter/netinet/ip_fil.h Sat Feb 11 18:04:43 2017 (r313647) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil.h Sat Feb 11 18:10:55 2017 (r313648) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702111810.v1BIAtHZ098942>