Date: Sun, 27 Nov 2011 12:35:28 +0100 From: Robert Millan <rmh@freebsd.org> To: Bruce Evans <brde@optusnet.com.au> Cc: Kostik Belousov <kostikbel@gmail.com>, Adrian Chadd <adrian@freebsd.org>, freebsd-current@freebsd.org, freebsd-arch@freebsd.org Subject: Re: [PATCH] Detect GNU/kFreeBSD in user-visible kernel headers (v2) Message-ID: <CAOfDtXMCYWP_EgtXzGzy0cT6--L-UER9UHZORqUS=%2BRvpQvqzQ@mail.gmail.com> In-Reply-To: <20111127131422.D802@besplex.bde.org> References: <20111123070036.GA29952@thorin> <20111124141821.O932@besplex.bde.org> <CAOfDtXMaHCW4rfEhzfhThGn6kY0=%2B209VhqFSBq9EF03fZLBhw@mail.gmail.com> <20111125150324.G1018@besplex.bde.org> <FBFD9FCA-1B01-4B66-8350-16F0410DE0F9@bsdimp.com> <20111126200749.GA72056@thorin> <20111127131422.D802@besplex.bde.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Bruce,
2011/11/27 Bruce Evans <brde@optusnet.com.au>:
> % Index: sys/cam/scsi/scsi_low.h
> % =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> % --- sys/cam/scsi/scsi_low.h =C2=A0 (revision 227956)
> % +++ sys/cam/scsi/scsi_low.h =C2=A0 (working copy)
> % @@ -53,10 +53,10 @@
> % =C2=A0#define =C2=A0 =C2=A0 =C2=A0SCSI_LOW_INTERFACE_XS
> % =C2=A0#endif =C2=A0 =C2=A0 =C2=A0 /* __NetBSD__ */
> % % -#ifdef =C2=A0 =C2=A0 __FreeBSD__
> % +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> % =C2=A0#define =C2=A0 =C2=A0 =C2=A0SCSI_LOW_INTERFACE_CAM
> % =C2=A0#define =C2=A0 =C2=A0 =C2=A0CAM
> % -#endif =C2=A0 =C2=A0 =C2=A0 /* __FreeBSD__ */
> % +#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
>
> It still has the whitespace-after tab style change for cam.
My initial patch didn't have it. Precisely I thought that you
requested this in your first mail. Did I missunderstand?
> % Index: sys/dev/firewire/firewirereg.h
> % =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> % --- sys/dev/firewire/firewirereg.h =C2=A0 =C2=A0(revision 227956)
> % +++ sys/dev/firewire/firewirereg.h =C2=A0 =C2=A0(working copy)
> % @@ -75,7 +75,8 @@
> % =C2=A0};
> % % =C2=A0struct firewire_softc {
> % -#if defined(__FreeBSD__) && __FreeBSD_version >=3D 500000
> % +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && \
> % + =C2=A0 =C2=A0__FreeBSD_version >=3D 500000
> % =C2=A0 =C2=A0 =C2=A0 struct cdev *dev;
> % =C2=A0#endif
> % =C2=A0 =C2=A0 =C2=A0 struct firewire_comm *fc;
>
> Here is a pre-existing problem that you didn't fix on a line that you
> changed.
Yes. I didn't say I would fix all pre-existing problems in lines that
need to be modified. In some cases I did, and in some cases I opted
to preserve the status quo.
> __FreeBSD_version it is impossible to determine if the data structure
> has new fields like the cdev in it. =C2=A0<sys/param.h> is a prerequisite
> for almost all kernel .c files, so this prerequisite should be satisfied
> automatically for them,
Earlier you asked not to include <sys/param.h>. If <sys/param.h> is a
prerequisite, why not just include it then?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOfDtXMCYWP_EgtXzGzy0cT6--L-UER9UHZORqUS=%2BRvpQvqzQ>