From owner-svn-src-all@freebsd.org Fri Jan 13 04:08:33 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A48D2CAD9DF; Fri, 13 Jan 2017 04:08:33 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 5AE381A4F; Fri, 13 Jan 2017 04:08:32 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id RtA7cHDVlrvfERtA8c9FPJ; Thu, 12 Jan 2017 21:08:25 -0700 X-Authority-Analysis: v=2.2 cv=UeUhcOaN c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=IgFoBzBjUZAA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=rYTwfTTU08m81dicfpcA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 2D33D250; Thu, 12 Jan 2017 20:08:23 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v0D48MKN097520; Thu, 12 Jan 2017 20:08:22 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201701130408.v0D48MKN097520@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Bjoern A. Zeeb" cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r311950 - head/sys/contrib/ipfilter/netinet In-Reply-To: Message from "Bjoern A. Zeeb" of "Thu, 12 Jan 2017 00:01:02 +0000." <201701120001.v0C012XL041489@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 12 Jan 2017 20:08:22 -0800 X-CMAE-Envelope: MS4wfLj2JEkSZx+OD0se8wmAaBLxej+KooLTWaan7ti+fdJWUxevYKJ8gAAb48TKXB7xrzQlTbdK9eNGx6rg0wksj5L8Sm/H/bDtudcwbG8vq/uCj5J1esmc SBBclOY6xTlHohC2qqTbQBO9wYkinpYLBcB9mv77XtH9YcWVorbE04zg+JfItItU9IZC8EoJWUAW6qN7Lg7U3yG6ElXZdN2HYPqDxL6SEQTbdo+ZSBdq4Tg6 cIC6O5nyLQWb9eyePU4B8ZjobKjpgQsJCIoMYeiG1MuAKQx8epoxivTeEfp0Uz4H X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 04:08:33 -0000 In message <201701120001.v0C012XL041489@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 > +#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 > -#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 FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.