[PATCH] Detect GNU/kFreeBSD in user-visible kernel headers (v2)

Robert Millan rmh at freebsd.org
Sun Nov 27 11:35:29 UTC 2011


Hi Bruce,

2011/11/27 Bruce Evans <brde at optusnet.com.au>:
> % Index: sys/cam/scsi/scsi_low.h
> % ===================================================================
> % --- sys/cam/scsi/scsi_low.h   (revision 227956)
> % +++ sys/cam/scsi/scsi_low.h   (working copy)
> % @@ -53,10 +53,10 @@
> %  #define      SCSI_LOW_INTERFACE_XS
> %  #endif       /* __NetBSD__ */
> % % -#ifdef     __FreeBSD__
> % +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
> %  #define      SCSI_LOW_INTERFACE_CAM
> %  #define      CAM
> % -#endif       /* __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
> % ===================================================================
> % --- sys/dev/firewire/firewirereg.h    (revision 227956)
> % +++ sys/dev/firewire/firewirereg.h    (working copy)
> % @@ -75,7 +75,8 @@
> %  };
> % %  struct firewire_softc {
> % -#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
> % +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && \
> % +    __FreeBSD_version >= 500000
> %       struct cdev *dev;
> %  #endif
> %       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.  <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?


More information about the freebsd-arch mailing list