From: Tim Yamin Date: Wed, 5 Jan 2005 22:44:25 +0000 (+0000) Subject: Fix the fix for DirectFB which turns out to be a DirectFB->Headers->GlibC conflict... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b3c5083cfee6215a39d89fc60fc7994f1a1a6d4;p=gentoo.git Fix the fix for DirectFB which turns out to be a DirectFB->Headers->GlibC conflict rather than a Headers<-->GlibC conflict. --- diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index d15b8de3d2e3..1497672bf997 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -9,7 +9,7 @@ MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654 MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631 MD5 602f7309c0163c018627f06b5f1ace3a files/linux26-headers-2.6.8.1-arm-float.patch 640 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352 -MD5 a8a3d9eac82bc360a11a23777343b736 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4116 +MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4132 MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528 MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978 MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux26-headers-2.6.8.1-r1 146 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 --- 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