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

[Robert Millan]

Author: rmh
Date: 2012-04-21 10:53:34 +0000 (Sat, 21 Apr 2012)
New Revision: 4214

Added:
   trunk/kfreebsd-kernel-headers/test/sys_sysctl.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
   trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
   trunk/kfreebsd-kernel-headers/debian/patches/ctltype_quad.diff
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix <sys/sysctl.h> and add a test to prevent future breakage.

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2012-04-21 10:53:34 UTC (rev 4214)
@@ -460,7 +460,7 @@
  	siginfo_t		ksi_info;
 --- a/sys/sys/sysctl.h
 +++ b/sys/sys/sysctl.h
-@@ -36,7 +36,105 @@
+@@ -36,7 +36,106 @@
  #ifndef _SYS_SYSCTL_H_
  #define	_SYS_SYSCTL_H_
  
@@ -468,6 +468,7 @@
 +#include <features.h>
 +#define __need_size_t
 +#include <stddef.h>
++#include <kern/types.h>	/* required by <vm/vm_param.h> */
 +#include <vm/vm_param.h>
 +
 +/****************************************  Stolen from sys/mount.h */
@@ -567,7 +568,7 @@
  
  struct thread;
  /*
-@@ -790,9 +888,15 @@
+@@ -790,9 +889,15 @@
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS

Modified: trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2012-04-21 10:53:34 UTC (rev 4214)
@@ -112,10 +112,10 @@
   */
 --- a/sys/i386/include/cpufunc.h
 +++ b/sys/i386/include/cpufunc.h
-@@ -40,6 +40,8 @@
+@@ -38,6 +38,8 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define	_MACHINE_CPUFUNC_H_
  
- #include <stdint.h>
- 
 +#include <sys/types.h>
 +
  #ifndef _SYS_CDEFS_H

Modified: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-21 10:53:34 UTC (rev 4214)
@@ -5,7 +5,7 @@
 +++ b/sys/amd64/include/cpufunc.h
 @@ -41,6 +41,9 @@
  
- #include <kern/types.h>
+ #include <sys/types.h>
  
 +#include <stdint.h>
 +
@@ -48,7 +48,7 @@
 +++ b/sys/i386/include/cpufunc.h
 @@ -40,6 +40,9 @@
  
- #include <kern/types.h>
+ #include <sys/types.h>
  
 +#include <stdint.h>
 +

Modified: trunk/kfreebsd-kernel-headers/debian/patches/ctltype_quad.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/ctltype_quad.diff	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/debian/patches/ctltype_quad.diff	2012-04-21 10:53:34 UTC (rev 4214)
@@ -3,7 +3,7 @@
 
 --- a/sys/sys/sysctl.h
 +++ b/sys/sys/sysctl.h
-@@ -165,6 +165,7 @@
+@@ -166,6 +166,7 @@
  #define	CTLTYPE_INT	2	/* name describes an integer */
  #define	CTLTYPE_STRING	3	/* name describes a string */
  #define	CTLTYPE_S64	4	/* name describes a signed 64-bit number */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 10:53:34 UTC (rev 4214)
@@ -72,8 +72,8 @@
  } __mbstate_t;
 +#endif
  
- /* Types below are defined in <sys/types.h> on FreeBSD.  We have to define them
-    here because <sys/types.h> is GNU-owned (some of them are also GNU types, but
+ /* FIXME: this belongs in <sys/time.h>.   */
+ #ifndef bintime 
 --- a/sys/amd64/include/_types.h
 +++ b/sys/amd64/include/_types.h
 @@ -76,11 +76,19 @@

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 09:26:35 UTC (rev 4213)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 10:53:34 UTC (rev 4214)
@@ -7,6 +7,7 @@
 	in_pcb.o \
 	ppp.o \
 	soundcard.o \
+	sys_sysctl.o \
 	usb.o \
 	$()
 

Added: trunk/kfreebsd-kernel-headers/test/sys_sysctl.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/sys_sysctl.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/sys_sysctl.c	2012-04-21 10:53:34 UTC (rev 4214)
@@ -0,0 +1 @@
+#include <sys/sysctl.h>