[Glibc-bsd-commits] r4013 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jan 28 13:39:51 UTC 2012
Author: rmh
Date: 2012-01-28 13:39:51 +0000 (Sat, 28 Jan 2012)
New Revision: 4013
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
Avoid defining __size_t, as this interacts badly with Glibc (which defines it as a macro).
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-26 18:17:24 UTC (rev 4012)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-28 13:39:51 UTC (rev 4013)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.69) unstable; urgency=low
+
+ * Avoid defining __size_t, as this interacts badly with Glibc (which
+ defines it as a macro).
+
+ -- Robert Millan <rmh at debian.org> Sat, 28 Jan 2012 14:39:42 +0100
+
kfreebsd-kernel-headers (0.68) unstable; urgency=low
* Add dev/bktr/ioctl_bt848.h and dev/bktr/ioctl_meteor.h.
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-26 18:17:24 UTC (rev 4012)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-28 13:39:51 UTC (rev 4013)
@@ -1,6 +1,6 @@
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
-@@ -119,4 +119,66 @@
+@@ -120,4 +120,66 @@
} __mbstate_t;
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2012-01-26 18:17:24 UTC (rev 4012)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2012-01-28 13:39:51 UTC (rev 4013)
@@ -13,9 +13,15 @@
typedef __int32_t __critical_t;
typedef long double __double_t;
typedef long double __float_t;
-@@ -88,7 +93,11 @@
+@@ -86,9 +91,17 @@
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+ typedef __int32_t __register_t;
typedef __int32_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
typedef __uint32_t __size_t; /* sizeof() */
++#endif
typedef __int32_t __ssize_t; /* byte count or error */
+#if defined(__GLIBC__) && !defined(_KERNEL)
+typedef long int __time_t;
@@ -75,15 +81,21 @@
#endif /* !_SYS__TYPES_H_ */
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
-@@ -76,11 +76,17 @@
+@@ -76,11 +76,23 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#ifndef __GLIBC__
++#if defined(__GLIBC__) && !defined(_KERNEL)
++typedef int __register_t;
++#else
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
typedef __uint64_t __size_t; /* sizeof() */
++#endif
typedef __int64_t __ssize_t; /* byte count or error */
+#if defined(__GLIBC__) && !defined(_KERNEL)
+typedef long int __time_t;
@@ -95,49 +107,124 @@
typedef __uint64_t __uintptr_t;
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
-@@ -74,7 +74,9 @@
+@@ -74,9 +74,17 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#ifndef __GLIBC__
++#if defined(__GLIBC__) && !defined(_KERNEL)
++typedef int __register_t;
++#else
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
typedef __uint64_t __size_t; /* sizeof() */
++#endif
typedef __int64_t __ssize_t; /* byte count or error */
+ typedef __int64_t __time_t; /* time()... */
+ typedef __uint64_t __uintfptr_t;
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
-@@ -94,7 +94,9 @@
+@@ -94,7 +94,11 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
#if defined(__mips_n64) || defined(__mips_n32)
-+# ifndef __GLIBC__
++# if defined(__GLIBC__) && !defined(_KERNEL)
++typedef int __register_t;
++# else
typedef __int64_t __register_t;
+# endif
typedef __int64_t f_register_t;
#else
typedef __int32_t __register_t;
+@@ -103,14 +107,22 @@
+ #ifdef __mips_n64
+ typedef __int64_t __ptrdiff_t;
+ typedef __int64_t __segsz_t;
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
+ typedef __uint64_t __size_t;
++#endif
+ typedef __int64_t __ssize_t;
+ typedef __uint64_t __uintfptr_t;
+ typedef __uint64_t __uintptr_t;
+ #else
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+ typedef __int32_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
+ typedef __uint32_t __size_t; /* sizeof() */
++#endif
+ typedef __int32_t __ssize_t; /* byte count or error */
+ typedef __uint32_t __uintfptr_t;
+ typedef __uint32_t __uintptr_t;
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
-@@ -94,7 +94,9 @@
+@@ -94,9 +94,17 @@
typedef __int64_t __int_least64_t;
#ifdef __LP64__
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#ifndef __GLIBC__
++#if defined(__GLIBC__) && !defined(_KERNEL)
++typedef int __register_t;
++#else
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
typedef __uint64_t __size_t; /* sizeof() */
++#endif
typedef __int64_t __ssize_t; /* byte count or error */
+ typedef __int64_t __time_t; /* time()... */
+ typedef __uint64_t __uintfptr_t;
+@@ -105,7 +113,11 @@
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+ typedef __int32_t __register_t;
+ typedef __int32_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
+ typedef __uint32_t __size_t; /* sizeof() */
++#endif
+ typedef __int32_t __ssize_t; /* byte count or error */
+ typedef __int32_t __time_t; /* time()... */
+ typedef __uint32_t __uintfptr_t;
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
-@@ -70,7 +70,9 @@
+@@ -70,9 +70,17 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#ifndef __GLIBC__
++#if defined(__GLIBC__) && !defined(_KERNEL)
++typedef int __register_t;
++#else
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
typedef __uint64_t __size_t; /* sizeof() */
++#endif
typedef __int64_t __ssize_t; /* byte count or error */
+ typedef __int64_t __time_t; /* time()... */
+ typedef __uint64_t __uintfptr_t;
+--- a/sys/arm/include/_types.h
++++ b/sys/arm/include/_types.h
+@@ -84,7 +84,11 @@
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+ typedef __int32_t __register_t;
+ typedef __int32_t __segsz_t; /* segment size (in pages) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Glibc defines __size_t using macros. Avoid collision. */
++#else
+ typedef __uint32_t __size_t; /* sizeof() */
++#endif
+ typedef __int32_t __ssize_t; /* byte count or error */
+ typedef __int64_t __time_t; /* time()... */
+ typedef __uint32_t __uintfptr_t;
More information about the Glibc-bsd-commits
mailing list