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

[Robert Millan]

Author: rmh
Date: 2012-01-23 19:55:08 +0000 (Mon, 23 Jan 2012)
New Revision: 3999

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
Log:
Redefine clock_t as signed to match with Glibc type.  (Closes: #656947)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-23 19:34:10 UTC (rev 3998)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-23 19:55:08 UTC (rev 3999)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.66) UNRELEASED; urgency=low
+
+  * Redefine clock_t as signed to match with Glibc type.  (Closes: #656947)
+
+ -- Robert Millan <rmh at debian.org>  Mon, 23 Jan 2012 20:40:16 +0100
+
 kfreebsd-kernel-headers (0.65) unstable; urgency=low
 
   * Add sys/_callout.h, sys/_cpuset.h and sys/_termios.h.

Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff	2012-01-23 19:34:10 UTC (rev 3998)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff	2012-01-23 19:55:08 UTC (rev 3999)
@@ -5,7 +5,7 @@
 
 --- a/sys/i386/include/_types.h
 +++ b/sys/i386/include/_types.h
-@@ -39,33 +39,15 @@
+@@ -39,42 +39,24 @@
  #ifndef _MACHINE__TYPES_H_
  #define	_MACHINE__TYPES_H_
  
@@ -41,8 +41,11 @@
 -/*
   * Standard type definitions.
   */
- typedef	unsigned long	__clock_t;		/* clock()... */
-@@ -74,7 +56,6 @@
+-typedef	unsigned long	__clock_t;		/* clock()... */
++// clock_t is signed on i386-kfreebsd-gnu
++typedef	__int32_t	__clock_t;		/* clock()... */
+ typedef	__int32_t	__critical_t;
+ typedef	long double	__double_t;
  typedef	long double	__float_t;
  typedef	__int32_t	__intfptr_t;
  typedef	__int64_t	__intmax_t;
@@ -50,7 +53,7 @@
  typedef	__int32_t	__int_fast8_t;
  typedef	__int32_t	__int_fast16_t;
  typedef	__int32_t	__int_fast32_t;
-@@ -86,9 +67,11 @@
+@@ -86,9 +68,11 @@
  typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
  typedef	__int32_t	__register_t;
  typedef	__int32_t	__segsz_t;		/* segment size (in pages) */