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

[Robert Millan]

Author: rmh
Date: 2012-02-25 11:58:19 +0000 (Sat, 25 Feb 2012)
New Revision: 4117

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Fix collisions in <sys/endian.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-02-25 11:45:47 UTC (rev 4116)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-02-25 11:58:19 UTC (rev 4117)
@@ -4,8 +4,9 @@
     rather than -isystem).
   * Include <sys/io.h> in <machine/cpufunc.h> (users expect the
     definitions we removed).
+  * Fix collisions in <sys/endian.h>.
 
- -- Robert Millan <rmh at debian.org>  Sat, 25 Feb 2012 12:45:40 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 25 Feb 2012 12:58:13 +0100
 
 kfreebsd-kernel-headers (0.74) unstable; urgency=low
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff	2012-02-25 11:58:19 UTC (rev 4117)
@@ -0,0 +1,25 @@
+
+bswapXX collides with glibc definitions, which uses __bswap_XX instead of
+__bswapXX.
+
+--- a/sys/sys/endian.h
++++ b/sys/sys/endian.h
+@@ -53,6 +53,10 @@
+ #define	_UINT64_T_DECLARED
+ #endif
+  
++#if !defined(_KERNEL) && defined(__GLIBC__)
++/* Avoid conflicting (but functionally equivalent) definitions below. */
++#include <endian.h>
++#else
+ /*
+  * General byte order swapping functions.
+  */
+@@ -93,6 +97,7 @@
+ #define	le32toh(x)	bswap32((x))
+ #define	le64toh(x)	bswap64((x))
+ #endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
++#endif
+ 
+ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
+ 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2012-02-25 11:45:47 UTC (rev 4116)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2012-02-25 11:58:19 UTC (rev 4117)
@@ -35,3 +35,4 @@
 035_devfs_int.diff
 042_syscall_stubs.diff
 ctltype_quad.diff
+endian_collision.diff