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

[Aurelien Jarno]

Author: aurel32
Date: 2006-03-20 18:03:49 +0000 (Mon, 20 Mar 2006)
New Revision: 1383

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
Log:
 * Fix machine/_types.h on kfreebsd-amd64 the same way as on kfreebsd-i386.




Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-03-20 17:15:10 UTC (rev 1382)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-03-20 18:03:49 UTC (rev 1383)
@@ -1,14 +1,18 @@
-kfreebsd-kernel-headers (0.16) UNRELEASED; urgency=low
+kfreebsd-kernel-headers (0.16) unreleased; urgency=low
 
+  [ Robert Millan ]
   * control (Architecture): Add kfreebsd-amd64.
   * patches/011_wine.diff: Add more elf header fixes.
   * Fix altq path (it's in sys/contrib/ now).
   * Install full nfsclient dir.
-  * Remove sys/acl.h, it should be provided by libacl instead.
   * Add sys/mdioctl.h (needed for mdconfig).
 
- -- Robert Millan <rmh at aybabtu.com>  Mon, 20 Mar 2006 12:58:37 +0100
+  [ Aurelien Jarno ]
+  * Remove sys/acl.h, it should be provided by libacl instead.
+  * Fix machine/_types.h on kfreebsd-amd64 the same way as on kfreebsd-i386.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 20 Mar 2006 18:59:21 +0100
+
 kfreebsd-kernel-headers (0.15) unreleased; urgency=low
 
   * patches/007_kvm.diff: Remove second hunk (not needed, and actualy

Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2006-03-20 17:15:10 UTC (rev 1382)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2006-03-20 18:03:49 UTC (rev 1383)
@@ -1,3 +1,43 @@
+diff -ur sys.orig/amd64/include/_types.h sys/amd64/include/_types.h
+--- sys.orig/amd64/include/_types.h	2005-09-07 09:08:27.000000000 +0200
++++ sys/amd64/include/_types.h	2006-03-20 18:56:31.000000000 +0100
+@@ -39,6 +39,7 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define	_MACHINE__TYPES_H_
+ 
++#ifndef __GLIBC__
+ /*
+  * Basic types upon which most other types are built.
+  */
+@@ -50,6 +51,7 @@
+ typedef	unsigned int		__uint32_t;
+ typedef	long			__int64_t;
+ typedef	unsigned long		__uint64_t;
++#endif /* __GLIBC__ */
+ 
+ /*
+  * Standard type definitions.
+@@ -61,7 +63,9 @@
+ typedef	double		__float_t;
+ typedef	__int64_t	__intfptr_t;
+ typedef	__int64_t	__intmax_t;
++#ifndef __GLIBC__
+ typedef	__int64_t	__intptr_t;
++#endif
+ typedef	__int32_t	__int_fast8_t;
+ typedef	__int32_t	__int_fast16_t;
+ typedef	__int32_t	__int_fast32_t;
+@@ -73,8 +77,10 @@
+ typedef	__int64_t	__ptrdiff_t;		/* ptr1 - ptr2 */
+ typedef	__int64_t	__register_t;
+ typedef	__int64_t	__segsz_t;		/* segment size (in pages) */
++#ifndef __GLIBC__
+ typedef	__uint64_t	__size_t;		/* sizeof() */
+ typedef	__int64_t	__ssize_t;		/* byte count or error */
++#endif
+ typedef	__int64_t	__time_t;		/* time()... */
+ typedef	__uint64_t	__uintfptr_t;
+ typedef	__uint64_t	__uintmax_t;
 diff -ur sys.orig/i386/include/_types.h sys/i386/include/_types.h
 --- sys.orig/i386/include/_types.h	2004-03-20 21:41:40.000000000 +0100
 +++ sys/i386/include/_types.h	2005-01-13 05:38:54.000000000 +0100