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

[Robert Millan]

Author: rmh
Date: 2012-01-20 23:24:29 +0000 (Fri, 20 Jan 2012)
New Revision: 3988

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
Log:
Add cap_rights_t to 018_sys__types.diff.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-20 23:02:12 UTC (rev 3987)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-20 23:24:29 UTC (rev 3988)
@@ -1,7 +1,7 @@
 kfreebsd-kernel-headers (0.65) UNRELEASED; urgency=low
 
   * Add sys/_callout.h (needed by sys/callout.h).
-  * 018_sys__types.diff: Remove cpumask_t.
+  * 018_sys__types.diff: Remove cpumask_t, add cap_rights_t.
   * Add sys/_cpuset.h (needed by machine-amd64/pmap.h).
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Jan 2012 00:02:02 +0100

Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2012-01-20 23:02:12 UTC (rev 3987)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2012-01-20 23:24:29 UTC (rev 3988)
@@ -13,10 +13,14 @@
  typedef	struct __mq	*__mqd_t;	/* mq_open()... */
  typedef	__uint32_t	__uid_t;
  typedef	unsigned int	__useconds_t;	/* microseconds (unsigned) */
-@@ -99,4 +98,61 @@
+@@ -99,4 +98,66 @@
  
  typedef	__uint32_t	__fixpt_t;	/* fixed point number */
  
++/* 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
++   thanks to _GNU_SOURCE non-sense they can't be used unconditionally).  */
++
 +#ifndef _CLOCK_T_DECLARED
 +typedef	__clock_t	clock_t;
 +#define	_CLOCK_T_DECLARED
@@ -65,6 +69,7 @@
 +typedef	__cpuwhich_t	cpuwhich_t;
 +typedef	__cpulevel_t	cpulevel_t;
 +typedef	__cpusetid_t	cpusetid_t;
++typedef	__cap_rights_t  cap_rights_t;
 +
 +#ifndef bintime 
 +#define bintime bintime