Date: Sat, 20 Oct 2007 23:34:06 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127861 for review Message-ID: <200710202334.l9KNY6Ta074487@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127861 Change 127861 by jb@jb_freebsd1 on 2007/10/20 23:33:51 Fix a clash between my p4 additions and what came through current, then propagate the change to RELENG_6. Affected files ... .. //depot/projects/dtrace/src/include/unistd.h#6 edit .. //depot/projects/dtrace6/src/include/unistd.h#2 edit Differences ... ==== //depot/projects/dtrace/src/include/unistd.h#6 (text+ko) ==== @@ -292,12 +292,12 @@ #if __BSD_VISIBLE #define _SC_NPROCESSORS_CONF 57 #define _SC_NPROCESSORS_ONLN 58 -#define _SC_NPROCESSORS_MAX 121 -#define _SC_CPUID_MAX 122 #endif /* Extensions found in Solaris and Linux. */ #define _SC_PHYS_PAGES 121 +#define _SC_NPROCESSORS_MAX 122 +#define _SC_CPUID_MAX 123 /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 ==== //depot/projects/dtrace6/src/include/unistd.h#2 (text+ko) ==== @@ -294,6 +294,11 @@ #define _SC_NPROCESSORS_ONLN 58 #endif +/* Extensions found in Solaris and Linux. */ +#define _SC_PHYS_PAGES 121 +#define _SC_NPROCESSORS_MAX 122 +#define _SC_CPUID_MAX 123 + /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 #define _CS_PATH 1 /* default value of PATH */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710202334.l9KNY6Ta074487>