diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-02 17:01:46 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-02 17:01:46 (GMT) |
commit | a9cecdaee93189dd04ada5a27cfaab2ff041662b (patch) | |
tree | 10d9d50433931e36d2d0ec2511caf12d2d62c67b /patches/gcc/4.4.0/350-index_macro.patch | |
parent | 8908eb30375d19816e1329b8a4aa4daa430204b0 (diff) | |
parent | cfffd94a50d2fa844e4cfea1fd9aef9136948658 (diff) |
Merge.
Diffstat (limited to 'patches/gcc/4.4.0/350-index_macro.patch')
-rw-r--r-- | patches/gcc/4.4.0/350-index_macro.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/gcc/4.4.0/350-index_macro.patch b/patches/gcc/4.4.0/350-index_macro.patch new file mode 100644 index 0000000..7bb899a --- /dev/null +++ b/patches/gcc/4.4.0/350-index_macro.patch @@ -0,0 +1,32 @@ +Original patch from: ../4.3.2/290-index_macro.patch + +-= BEGIN original header =- +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch +-= END original header =- + +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200 ++++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100 +@@ -59,6 +59,9 @@ + #include <bits/gthr.h> + #include <tr1/functional> + ++/* cope w/ index defined as macro, SuSv3 proposal */ ++#undef index ++ + # ifdef __GC + # define __GC_CONST const + # else +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200 ++++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100 +@@ -54,6 +54,9 @@ + #include <ext/memory> // For uninitialized_copy_n + #include <ext/numeric> // For power + ++/* cope w/ index defined as macro, SuSv3 proposal */ ++#undef index ++ + _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + + using std::size_t; |