[Glibc-bsd-commits] r4269 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-05-21 15:16:12 +0000 (Mon, 21 May 2012)
New Revision: 4269

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
Log:
Fix NZERO collision.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 14:37:36 UTC (rev 4268)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 15:16:12 UTC (rev 4269)
@@ -7,6 +7,7 @@
   * Add test for <sys/devicestat.h> buildability.
   * Unexpose a few more macros which collide with glibc:
     CLOCK_THREAD_CPUTIME_ID, TIMER_RELTIME and TIMER_ABSTIME.
+  * Fix NZERO collision.
 
  -- Robert Millan <rmh at debian.org>  Sat, 19 May 2012 14:19:56 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2012-05-21 14:37:36 UTC (rev 4268)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2012-05-21 15:16:12 UTC (rev 4269)
@@ -28,11 +28,13 @@
  #define	NOFILE		OPEN_MAX	/* max open files per process */
  #define	NOGROUP		65535		/* marker for empty group set member */
  #define MAXHOSTNAMELEN	256		/* max hostname size */
-@@ -199,7 +200,9 @@
+@@ -197,9 +198,11 @@
+ #define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
+ #define	PBDRY	0x400	/* for PCATCH stop is done on the user boundary */
  
++#if 0
  #define	NZERO	0		/* default "nice" */
  
-+#if 0
  #define	NBBY	8		/* number of bits in a byte */
 +#endif
  #define	NBPW	sizeof(int)	/* number of bytes per word (integer) */