summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2005-01-05 22:44:25 +0000
committerTim Yamin <plasmaroo@gentoo.org>2005-01-05 22:44:25 +0000
commit7f0a3b183bab0ea4b433dea10c725112d4a88376 (patch)
tree0f76f9ac9adad038c92056bc120de5ae8948ef14 /sys-kernel/linux26-headers/files
parentfixing wrapper in arts (Manifest recommit) (diff)
downloadgentoo-2-7f0a3b183bab0ea4b433dea10c725112d4a88376.tar.gz
gentoo-2-7f0a3b183bab0ea4b433dea10c725112d4a88376.tar.bz2
gentoo-2-7f0a3b183bab0ea4b433dea10c725112d4a88376.zip
Fix the fix for DirectFB which turns out to be a DirectFB->Headers->GlibC conflict rather than a Headers<-->GlibC conflict.
Diffstat (limited to 'sys-kernel/linux26-headers/files')
-rw-r--r--sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch
index bfccd947c593..a0e8dbac5e03 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch
@@ -126,7 +126,7 @@
#include <asm/sigcontext.h>
--- linux-2.6.3/include/asm-x86_64/types.h 2004-02-17 19:59:16.000000000 -0800
+++ linux-2.6.3/include/asm-x86_64/types.h 2004-02-28 18:49:21.000000000 -0800
-@@ -19,8 +19,16 @@
+@@ -19,8 +19,18 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -138,8 +138,10 @@
+# endif /* __extension__ */
+#endif /* __GNUC__ */
+
-+#ifndef _SYS_TYPES_H
++#ifndef __s64
+__extension__ typedef __signed__ long long __s64;
++#endif
++#ifndef __u64
+__extension__ typedef unsigned long long __u64;
+#endif