[Glibc-bsd-commits] r4215 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

Sat Apr 21 12:46:33 UTC 2012

Author: rmh
Date: 2012-04-21 12:46:33 +0000 (Sat, 21 Apr 2012)
New Revision: 4215

Modified:
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
   trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
   trunk/kfreebsd-kernel-headers/test/bus.c
   trunk/kfreebsd-kernel-headers/test/cpufunc.c
   trunk/kfreebsd-kernel-headers/test/in_pcb.c
   trunk/kfreebsd-kernel-headers/test/ppp.c
   trunk/kfreebsd-kernel-headers/test/type_collision.c
   trunk/kfreebsd-kernel-headers/test/uintXX_t.c
   trunk/kfreebsd-kernel-headers/test/usb.c
Log:
Unbreak eglibc build.

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================

--- trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 12:46:33 UTC (rev 4215)
@@ -307,7 +307,7 @@
 sys/sys/ttycom.h                        usr/include/sys
 sys/sys/ttyqueue.h                      usr/include/sys
 # Avoid conflict with <sys/types.h> in glibc
-sys/sys/types.h				usr/include/kern
+sys/sys/types.h				usr/include/sys/kern
 sys/sys/ucred.h                         usr/include/sys
 sys/sys/unpcb.h                         usr/include/sys
 sys/sys/user.h                          usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 12:46:33 UTC (rev 4215)
@@ -468,7 +468,7 @@
 +#include <features.h>
 +#define __need_size_t
 +#include <stddef.h>
-+#include <kern/types.h>	/* required by <vm/vm_param.h> */
++#include <sys/kern/types.h>	/* required by <vm/vm_param.h> */
 +#include <vm/vm_param.h>
 +
 +/****************************************  Stolen from sys/mount.h */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2012-04-21 12:46:33 UTC (rev 4215)
@@ -184,7 +184,7 @@
 @@ -20,6 +20,7 @@
  
  #ifndef _KERNEL
- #include <kern/types.h>
+ #include <sys/kern/types.h>
 +#include <stdint.h>
  #endif
  #include <sys/ioccom.h>

Modified: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-21 12:46:33 UTC (rev 4215)
@@ -18,7 +18,7 @@
 @@ -60,6 +60,7 @@
  #define	_MACHINE_CPUFUNC_H_
  
- #include <kern/types.h>
+ #include <sys/kern/types.h>
 +#include <stdint.h>
  #include <machine/cpuregs.h>
  

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 12:46:33 UTC (rev 4215)
@@ -72,7 +72,7 @@
 		-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \
 		-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \
 		\
-		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <kern\/types.h>/g' \
+		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kern\/types.h>/g' \
 		\
 		-e 's/__size_t/size_t/g' \
 	; done) ; \

Modified: trunk/kfreebsd-kernel-headers/test/bus.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/bus.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/bus.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,3 +1,3 @@
 #include <sys/cdefs.h>
-#include <kern/types.h>
+#include <sys/kern/types.h>
 #include <machine/bus.h>

Modified: trunk/kfreebsd-kernel-headers/test/cpufunc.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/cpufunc.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/cpufunc.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,4 +1,4 @@
-#include <kern/types.h>
+#include <sys/kern/types.h>
 
 /* Include <machine/cpufunc.h> WITHOUT explicit <stdint.h>. */
 #include <machine/cpufunc.h>

Modified: trunk/kfreebsd-kernel-headers/test/in_pcb.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/in_pcb.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/in_pcb.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,3 +1,3 @@
-#include <kern/types.h>
+#include <sys/kern/types.h>
 #include <netinet/in.h>		/* struct in_addr */
 #include <netinet/in_pcb.h>

Modified: trunk/kfreebsd-kernel-headers/test/ppp.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/ppp.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/ppp.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,2 +1,2 @@
-#include <kern/types.h>
+#include <sys/kern/types.h>
 #include <net/ppp_defs.h>

Modified: trunk/kfreebsd-kernel-headers/test/type_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/type_collision.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/type_collision.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,2 +1,2 @@
 #include <sys/types.h>
-#include <kern/types.h>
+#include <sys/kern/types.h>

Modified: trunk/kfreebsd-kernel-headers/test/uintXX_t.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/uintXX_t.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/uintXX_t.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,7 +1,7 @@
-/* Test that <kern/types.h> provides uintXX_t without explicitly including
+/* Test that <sys/kern/types.h> provides uintXX_t without explicitly including
    <stdint.h>.  */
 
-#include <kern/types.h>
+#include <sys/kern/types.h>
 
 uint8_t a;
 uint16_t b;

Modified: trunk/kfreebsd-kernel-headers/test/usb.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/usb.c	2012-04-21 10:53:34 UTC (rev 4214)
+++ trunk/kfreebsd-kernel-headers/test/usb.c	2012-04-21 12:46:33 UTC (rev 4215)
@@ -1,3 +1,3 @@
-#include <kern/types.h>
+#include <sys/kern/types.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>


