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

[Aurelien Jarno]

Author: aurel32
Date: 2006-05-03 21:05:38 +0000 (Wed, 03 May 2006)
New Revision: 1546

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
Log:
  * 012_strace.diff:  Misc amd64 fixes.




Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-05-03 20:31:03 UTC (rev 1545)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-05-03 21:05:38 UTC (rev 1546)
@@ -11,6 +11,9 @@
   * Add sys/iconv.h.
   * patches/004_stdint_h.diff:  Include <stdint.h> for ieee80211.h.
 
+  [ Aurelien Jarno ]
+  * 012_strace.diff:  Misc amd64 fixes.
+
  -- Robert Millan <rmh at aybabtu.com>  Wed,  3 May 2006 22:17:48 +0200
 
 kfreebsd-kernel-headers (0.17) unreleased; urgency=low

Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-03 20:31:03 UTC (rev 1545)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-03 21:05:38 UTC (rev 1546)
@@ -51,3 +51,30 @@
  typedef	__uint32_t	__uintfptr_t;
  typedef	__uint64_t	__uintmax_t;
  typedef	__uint32_t	__uintptr_t;
+--- sys/amd64/include/_types.h~	2005-09-07 09:08:27.000000000 +0200
++++ sys/amd64/include/_types.h	2006-05-03 22:58:19.000000000 +0200
+@@ -39,6 +39,8 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define	_MACHINE__TYPES_H_
+ 
++#include <sys/types.h>
++
+ /*
+  * Basic types upon which most other types are built.
+  */
+@@ -54,7 +56,6 @@
+ /*
+  * Standard type definitions.
+  */
+-typedef	__int32_t	__clock_t;		/* clock()... */
+ typedef	unsigned int	__cpumask_t;
+ typedef	__int64_t	__critical_t;
+ typedef	double		__double_t;
+@@ -75,7 +76,6 @@
+ typedef	__int64_t	__segsz_t;		/* segment size (in pages) */
+ typedef	__uint64_t	__size_t;		/* sizeof() */
+ typedef	__int64_t	__ssize_t;		/* byte count or error */
+-typedef	__int64_t	__time_t;		/* time()... */
+ typedef	__uint64_t	__uintfptr_t;
+ typedef	__uint64_t	__uintmax_t;
+ typedef	__uint64_t	__uintptr_t;