[Glibc-bsd-commits] r4015 - in trunk/freebsd-buildutils/debian: . local/include/machine local/include/sys

[Robert Millan]

Author: rmh
Date: 2012-01-28 18:25:07 +0000 (Sat, 28 Jan 2012)
New Revision: 4015

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/local/include/machine/endian.h
   trunk/freebsd-buildutils/debian/local/include/sys/endian.h
Log:
Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-01-28 18:24:01 UTC (rev 4014)
+++ trunk/freebsd-buildutils/debian/changelog	2012-01-28 18:25:07 UTC (rev 4015)
@@ -3,8 +3,9 @@
   * Replace 10_non_kfreebsd.diff with equivalent patch from upstream
     HEAD.
   * Add __BEGIN_DECLS / __END_DECLS in local unistd.h.
+  * Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.
 
- -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 19:23:40 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 19:24:52 +0100
 
 freebsd-buildutils (9.0-2) unstable; urgency=low
 

Modified: trunk/freebsd-buildutils/debian/local/include/machine/endian.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/machine/endian.h	2012-01-28 18:24:01 UTC (rev 4014)
+++ trunk/freebsd-buildutils/debian/local/include/machine/endian.h	2012-01-28 18:25:07 UTC (rev 4015)
@@ -1,7 +1,12 @@
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-#include_next <endian.h>
-#define _LITTLE_ENDIAN	LITTLE_ENDIAN
-#define _BIG_ENDIAN	BIG_ENDIAN
-#define _BYTE_ORDER	BYTE_ORDER
+#ifdef __FreeBSD_kernel__
+/* We have <machine/endian.h>.  Use it.  */
+# include_next <machine/endian.h>
+#else
+# ifndef _MACHINE_ENDIAN_H_
+#  define _MACHINE_ENDIAN_H_
+#  include_next <endian.h>
+#  define _LITTLE_ENDIAN	LITTLE_ENDIAN
+#  define _BIG_ENDIAN		BIG_ENDIAN
+#  define _BYTE_ORDER		BYTE_ORDER
+# endif
 #endif

Modified: trunk/freebsd-buildutils/debian/local/include/sys/endian.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/endian.h	2012-01-28 18:24:01 UTC (rev 4014)
+++ trunk/freebsd-buildutils/debian/local/include/sys/endian.h	2012-01-28 18:25:07 UTC (rev 4015)
@@ -1,4 +1,9 @@
-#ifndef _SYS_ENDIAN_H_
-#define _SYS_ENDIAN_H_
-#include_next <machine/endian.h>
+#ifdef __FreeBSD_kernel__
+/* We have <sys/endian.h>.  Use it.  */
+# include_next <sys/endian.h>
+#else
+# ifndef _SYS_ENDIAN_H_
+#  define _SYS_ENDIAN_H_
+#  include_next <machine/endian.h>
+# endif
 #endif