[Glibc-bsd-commits] r1644 -
trunk/kfreebsd-kernel-headers/debian/patches
Petr Salinger
ps-guest at costa.debian.org
Fri Aug 25 08:41:06 UTC 2006
Author: ps-guest
Date: 2006-08-25 08:41:04 +0000 (Fri, 25 Aug 2006)
New Revision: 1644
Added:
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
Log:
* bump osreldate.h, "sys/cdefs.h" fixes
Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2006-08-25 07:23:16 UTC (rev 1643)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2006-08-25 08:41:04 UTC (rev 1644)
@@ -1,10 +1,16 @@
diff -Nur sys/osreldate.h sys/osreldate.h
--- sys/osreldate.h 1970-01-01 01:00:00.000000000 +0100
+++ sys/osreldate.h 2004-08-03 02:21:30.000000000 +0200
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,12 @@
+
-+/* kFreeBSD 5.4 headers */
++/* kFreeBSD 6.1 headers */
+
++#include <sys/cdefs.h>
++#ifndef _SYS_CDEFS_H_
++#define _SYS_CDEFS_H_
++#endif
++
+#undef __FreeBSD_kernel__
-+#define __FreeBSD_kernel__ 5
-+#define __FreeBSD_kernel_version 504001
++#define __FreeBSD_kernel__ 6
++#define __FreeBSD_kernel_version 601000
++
Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2006-08-25 07:23:16 UTC (rev 1643)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2006-08-25 08:41:04 UTC (rev 1644)
@@ -24,57 +24,3 @@
int td_altkstack_pages; /* (a) Size of alternate kstack. */
u_int td_critnest; /* (k) Critical section nest level. */
struct mdthread td_md; /* (k) Any machine-dependent fields. */
---- sys/i386/include/_types.h~ 2004-03-20 21:41:40.000000000 +0100
-+++ sys/i386/include/_types.h 2004-12-08 02:22:34.000000000 +0100
-@@ -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.
- */
-@@ -67,7 +69,6 @@
- /*
- * Standard type definitions.
- */
--typedef unsigned long __clock_t; /* clock()... */
- typedef unsigned int __cpumask_t;
- typedef __int32_t __critical_t;
- typedef double __double_t;
-@@ -88,7 +89,6 @@
- typedef __int32_t __segsz_t; /* segment size (in pages) */
- typedef __uint32_t __size_t; /* sizeof() */
- typedef __int32_t __ssize_t; /* byte count or error */
--typedef __int32_t __time_t; /* time()... */
- 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;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2006-08-25 07:23:16 UTC (rev 1643)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2006-08-25 08:41:04 UTC (rev 1644)
@@ -1,82 +1,3 @@
-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 __uint64_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
- typedef __uint64_t __uintptr_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
-@@ -39,6 +39,7 @@
- #ifndef _MACHINE__TYPES_H_
- #define _MACHINE__TYPES_H_
-
-+#ifndef __GLIBC__
- /*
- * Basic types upon which most other types are built.
- */
-@@ -63,6 +64,7 @@
- /* LONGLONG */
- typedef unsigned long long __uint64_t;
- #endif
-+#endif /* __GLIBC__ */
-
- /*
- * Standard type definitions.
-@@ -74,7 +76,11 @@
- typedef double __float_t;
- typedef __int32_t __intfptr_t;
- typedef __int64_t __intmax_t;
-+#ifndef __GLIBC__
- typedef __int32_t __intptr_t;
-+typedef __int32_t __ssize_t; /* byte count or error */
-+typedef __uint32_t __size_t; /* sizeof() */
-+#endif
- typedef __int32_t __int_fast8_t;
- typedef __int32_t __int_fast16_t;
- typedef __int32_t __int_fast32_t;
-@@ -86,7 +92,6 @@
- typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
- typedef __int32_t __register_t;
- typedef __int32_t __segsz_t; /* segment size (in pages) */
--typedef __uint32_t __size_t; /* sizeof() */
- typedef __int32_t __ssize_t; /* byte count or error */
- typedef __uint32_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
diff -ur sys.orig/dev/usb/usb.h sys/dev/usb/usb.h
--- sys.orig/dev/usb/usb.h 2005-03-02 21:21:45.000000000 +0100
+++ sys/dev/usb/usb.h 2005-03-02 21:26:56.000000000 +0100
Added: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2006-08-25 07:23:16 UTC (rev 1643)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2006-08-25 08:41:04 UTC (rev 1644)
@@ -0,0 +1,110 @@
+Index: sys/i386/include/_types.h
+===================================================================
+--- sys/i386/include/_types.h.orig 2006-08-25 12:18:54.091511000 +0200
++++ sys/i386/include/_types.h 2006-08-25 12:25:31.000000000 +0200
+@@ -39,12 +39,15 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define _MACHINE__TYPES_H_
+
++#include <sys/types.h>
++#include <sys/cdefs.h>
+ #ifndef _SYS_CDEFS_H_
+-#error this file needs sys/cdefs.h as a prerequisite
++#define _SYS_CDEFS_H_ 1
+ #endif
+
+ #define __NO_STRICT_ALIGNMENT
+
++#ifndef __GLIBC__
+ /*
+ * Basic types upon which most other types are built.
+ */
+@@ -69,18 +72,20 @@
+ /* LONGLONG */
+ typedef unsigned long long __uint64_t;
+ #endif
++#endif /* __GLIBC__ */
+
+ /*
+ * Standard type definitions.
+ */
+-typedef unsigned long __clock_t; /* clock()... */
+ typedef unsigned int __cpumask_t;
+ typedef __int32_t __critical_t;
+ typedef double __double_t;
+ typedef double __float_t;
+ typedef __int32_t __intfptr_t;
+ typedef __int64_t __intmax_t;
++#ifndef __GLIBC__
+ typedef __int32_t __intptr_t;
++#endif
+ typedef __int32_t __int_fast8_t;
+ typedef __int32_t __int_fast16_t;
+ typedef __int32_t __int_fast32_t;
+@@ -92,9 +97,11 @@
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+ typedef __int32_t __register_t;
+ typedef __int32_t __segsz_t; /* segment size (in pages) */
++#ifndef __GLIBC__
+ typedef __uint32_t __size_t; /* sizeof() */
+ typedef __int32_t __ssize_t; /* byte count or error */
+ typedef __int32_t __time_t; /* time()... */
++#endif
+ typedef __uint32_t __uintfptr_t;
+ typedef __uint64_t __uintmax_t;
+ typedef __uint32_t __uintptr_t;
+Index: sys/amd64/include/_types.h
+===================================================================
+--- sys/amd64/include/_types.h.orig 2006-08-25 12:18:54.127268000 +0200
++++ sys/amd64/include/_types.h 2006-08-25 12:26:12.000000000 +0200
+@@ -39,12 +39,15 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define _MACHINE__TYPES_H_
+
++#include <sys/types.h>
++#include <sys/cdefs.h>
+ #ifndef _SYS_CDEFS_H_
+-#error this file needs sys/cdefs.h as a prerequisite
++#define _SYS_CDEFS_H_
+ #endif
+
+ #define __NO_STRICT_ALIGNMENT
+
++#ifndef __GLIBC__
+ /*
+ * Basic types upon which most other types are built.
+ */
+@@ -56,18 +59,20 @@
+ typedef unsigned int __uint32_t;
+ typedef long __int64_t;
+ typedef unsigned long __uint64_t;
++#endif /* __GLIBC__ */
+
+ /*
+ * Standard type definitions.
+ */
+-typedef __int32_t __clock_t; /* clock()... */
+ typedef unsigned int __cpumask_t;
+ typedef __int64_t __critical_t;
+ typedef double __double_t;
+ 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;
+@@ -79,9 +84,11 @@
+ 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 */
+ typedef __int64_t __time_t; /* time()... */
++#endif
+ typedef __uint64_t __uintfptr_t;
+ typedef __uint64_t __uintmax_t;
+ typedef __uint64_t __uintptr_t;
More information about the Glibc-bsd-commits
mailing list