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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-06-18 19:07:30 +0000 (Tue, 18 Jun 2013)
New Revision: 4524

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
Log:
patches/param_collision.diff: Fix DEV_BSIZE collision (in <sys/param.h>).

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-18 13:35:13 UTC (rev 4523)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-18 19:07:30 UTC (rev 4524)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.85) UNRELEASED; urgency=low
+
+  * patches/param_collision.diff: Fix DEV_BSIZE collision (in
+    <sys/param.h>).
+
+ -- Robert Millan <rmh at debian.org>  Tue, 18 Jun 2013 21:06:59 +0200
+
 kfreebsd-kernel-headers (0.84) unstable; urgency=low
 
   [ Robert Millan ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2013-06-18 13:35:13 UTC (rev 4523)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2013-06-18 19:07:30 UTC (rev 4524)
@@ -28,7 +28,20 @@
  #define	NOFILE		OPEN_MAX	/* max open files per process */
  #define	NOGROUP		65535		/* marker for empty group set member */
  #define MAXHOSTNAMELEN	256		/* max hostname size */
-@@ -197,9 +198,11 @@
+@@ -117,10 +118,12 @@
+ #include <sys/limits.h>
+ #endif
+ 
++#if 0
+ #ifndef DEV_BSHIFT
+ #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
+ #endif
+ #define	DEV_BSIZE	(1<<DEV_BSHIFT)
++#endif
+ 
+ #ifndef BLKDEV_IOSIZE
+ #define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
+@@ -197,9 +200,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 */
  
@@ -40,7 +53,7 @@
  #define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
  
  #define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-@@ -245,6 +248,7 @@
+@@ -245,6 +250,7 @@
  #define	MAXPATHLEN	PATH_MAX
  #define MAXSYMLINKS	32
  
@@ -48,7 +61,7 @@
  /* Bit map related macros. */
  #define	setbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
  #define	clrbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -252,15 +256,20 @@
+@@ -252,15 +258,20 @@
  	(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
  #define	isclr(a,i)							\
  	((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)