Date: Sat, 20 Oct 2007 23:44:19 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127862 for review Message-ID: <200710202344.l9KNiJUh074956@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127862 Change 127862 by jb@jb_freebsd1 on 2007/10/20 23:44:11 Prevent Solaris-specific things from clashing with FreeBSD's definitions. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ==== @@ -111,6 +111,7 @@ #define L_MAXMIN L_MAXMIN32 #endif +#if defined(sun) #ifdef _KERNEL /* major part of a device internal to the kernel */ @@ -171,6 +172,8 @@ NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ)) #define geteminor(x) (minor_t)((x) & L_MAXMIN) +#endif /* sun */ + /* * These are versions of the kernel routines for compressing and * expanding long device numbers that don't return errors. ==== //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ==== @@ -111,6 +111,7 @@ #define L_MAXMIN L_MAXMIN32 #endif +#if defined(sun) #ifdef _KERNEL /* major part of a device internal to the kernel */ @@ -171,6 +172,8 @@ NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ)) #define geteminor(x) (minor_t)((x) & L_MAXMIN) +#endif /* sun */ + /* * These are versions of the kernel routines for compressing and * expanding long device numbers that don't return errors.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710202344.l9KNiJUh074956>