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

[Robert Millan]

Author: rmh
Date: 2012-02-15 19:47:05 +0000 (Wed, 15 Feb 2012)
New Revision: 4088

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/local/include/sys/types.h
   trunk/freebsd-buildutils/debian/patches/21_endian.diff
Log:
Make <sys/types.h> imply <machine/endian.h>, even on non-kFreeBSD platforms (we always have <machine/endian.h> in local directory).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-02-14 07:24:59 UTC (rev 4087)
+++ trunk/freebsd-buildutils/debian/changelog	2012-02-15 19:47:05 UTC (rev 4088)
@@ -1,3 +1,10 @@
+freebsd-buildutils (9.0-6) unstable; urgency=low
+
+  * Make <sys/types.h> imply <machine/endian.h>, even on non-kFreeBSD
+    platforms (we always have <machine/endian.h> in local directory).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Feb 2012 20:45:29 +0100
+
 freebsd-buildutils (9.0-5) unstable; urgency=low
 
   * Add implicit includes to sys/stdint.h.

Modified: trunk/freebsd-buildutils/debian/local/include/sys/types.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/types.h	2012-02-14 07:24:59 UTC (rev 4087)
+++ trunk/freebsd-buildutils/debian/local/include/sys/types.h	2012-02-15 19:47:05 UTC (rev 4088)
@@ -4,9 +4,9 @@
 #include <sys/cdefs.h>
 #include <stdint.h> /* uintXX_t */
 
-#ifdef __FreeBSD_kernel__
 /* Emulate implicit includes on FreeBSD */
 #include <machine/endian.h>
+#ifdef __FreeBSD_kernel__
 #include <sys/_types.h>
 #endif
 

Modified: trunk/freebsd-buildutils/debian/patches/21_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/21_endian.diff	2012-02-14 07:24:59 UTC (rev 4087)
+++ trunk/freebsd-buildutils/debian/patches/21_endian.diff	2012-02-15 19:47:05 UTC (rev 4088)
@@ -7,7 +7,15 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -881,6 +881,7 @@
+@@ -61,6 +61,7 @@
+  *			the .MFLAGS target.
+  */
+ 
++#include <sys/endian.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+@@ -881,6 +882,7 @@
  	const char *machine;
  	const char *machine_arch;
  	const char *machine_cpu;
@@ -15,7 +23,7 @@
  	Boolean outOfDate = TRUE;	/* FALSE if all targets up to date */
  	const char *p;
  	const char *pathp;
-@@ -1014,6 +1015,16 @@
+@@ -1014,6 +1016,16 @@
  	Var_SetGlobal("MACHINE", machine);
  	Var_SetGlobal("MACHINE_ARCH", machine_arch);
  	Var_SetGlobal("MACHINE_CPU", machine_cpu);