Re: [PATCH] Detect GNU/kFreeBSD in user-visible kernel headers (

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?
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"