summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-12-30 23:42:05 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-12-30 23:42:05 +0000
commit523dfdae1398ac452065d7962e138cc50d096c89 (patch)
tree30b73f3fb4c439680c7727134da2af5ec9b7df9f /sys-kernel/linux-headers
parentFix metadata.xml and allong remove amd64 from the keywords as nasm is not on ... (diff)
downloadhistorical-523dfdae1398ac452065d7962e138cc50d096c89.tar.gz
historical-523dfdae1398ac452065d7962e138cc50d096c89.tar.bz2
historical-523dfdae1398ac452065d7962e138cc50d096c89.zip
Updated patch, this gets mplayer to compile properly: bug #36764.
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
index e04cb7a9e7fb..711b7da6e8ec 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
@@ -73,18 +73,22 @@ diff -ur linux-2.6.0/include/linux/compiler-gcc2.h linux-2.6.0/include/linux.gen
* The attribute `pure' is not implemented in GCC versions earlier
diff -ur linux-2.6.0/include/linux/compiler-gcc3.h linux-2.6.0/include/linux.gentoo/compiler-gcc3.h
--- linux-2.6.0/include/linux/compiler-gcc3.h 2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/compiler-gcc3.h 2003-12-29 20:07:05.000000000 +0000
-@@ -6,7 +6,9 @@
++++ linux-2.6.0/include/linux.gentoo/compiler-gcc3.h 2003-12-30 23:34:55.000000000 +0000
+@@ -3,6 +3,8 @@
+ /* These definitions are for GCC v3.x. */
+ #include <linux/compiler-gcc.h>
+
++#ifdef __KERNEL__
++
#if __GNUC_MINOR__ >= 1
# define inline __inline__ __attribute__((always_inline))
# define __inline__ __inline__ __attribute__((always_inline))
--# define __inline __inline__ __attribute__((always_inline))
-+# ifndef __inline
-+# define __inline __inline__ __attribute__((always_inline))
-+# endif
+@@ -20,3 +22,5 @@
#endif
- #if __GNUC_MINOR__ > 0
+ #define __attribute_pure__ __attribute__((pure))
++
++#endif /* __KERNEL__ */
diff -ur linux-2.6.0/include/linux/cpumask.h linux-2.6.0/include/linux.gentoo/cpumask.h
--- linux-2.6.0/include/linux/cpumask.h 2003-12-27 19:22:38.000000000 +0000
+++ linux-2.6.0/include/linux.gentoo/cpumask.h 2003-12-27 19:19:31.000000000 +0000