svn commit: r311950 - head/sys/contrib/ipfilter/netinet

[Cy Schubert]

In message <201701120001.v0C012XL041489 at repo.freebsd.org>, "Bjoern A. Zeeb" 
wri
tes:
> Author: bz
> Date: Thu Jan 12 00:01:02 2017
> New Revision: 311950
> URL: https://svnweb.freebsd.org/changeset/base/311950
> 
> Log:
>   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:
>   head/sys/contrib/ipfilter/netinet/ip_fil.h
> 
> Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h
> =============================================================================
> =
> --- head/sys/contrib/ipfilter/netinet/ip_fil.h	Wed Jan 11 23:48:17 201
> 7	(r311949)
> +++ head/sys/contrib/ipfilter/netinet/ip_fil.h	Thu Jan 12 00:01:02 201
> 7	(r311950)
> @@ -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
> 
> 

Thanks Bjoern.

Would you mind MFCing this at some point?


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.