patches/gcc/3.4.6/130-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Apr 20 21:10:03 2009 +0000 (2009-04-20)
changeset 1299 3448ac3f1a5d
parent 339 bd5e0a849352
permissions -rw-r--r--
There's no longer any reason to require GNU awk:
- the only part that required it (socks proxy settings) is gone,
- all remaining awk scripts are POSIXly correct (or should be).

-------- diffstat follows --------
/trunk/configure | 5 2 3 0 ++---
/trunk/Makefile.in | 2 0 2 0 --
/trunk/scripts/build/kernel/linux.sh | 2 1 1 0 +-
/trunk/scripts/build/internals.sh | 1 0 1 0 -
/trunk/scripts/build/mpfr.sh | 2 1 1 0 +-
/trunk/scripts/functions | 4 2 2 0 ++--
/trunk/scripts/saveSample.sh.in | 4 2 2 0 ++--
7 files changed, 8 insertions(+), 12 deletions(-)
yann@339
     1
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/rope gcc-3.4.6/libstdc++-v3/include/ext/rope
yann@339
     2
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/rope	2005-01-16 23:08:43.000000000 +0100
yann@339
     3
+++ gcc-3.4.6/libstdc++-v3/include/ext/rope	2007-08-15 22:53:37.000000000 +0200
yann@339
     4
@@ -58,6 +58,9 @@
yann@339
     5
 #include <bits/allocator.h>
yann@339
     6
 #include <ext/hash_fun.h>
yann@339
     7
 
yann@339
     8
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339
     9
+#undef index
yann@339
    10
+
yann@339
    11
 # ifdef __GC
yann@339
    12
 #   define __GC_CONST const
yann@339
    13
 # else
yann@339
    14
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h
yann@339
    15
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h	2004-09-08 15:36:04.000000000 +0200
yann@339
    16
+++ gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h	2007-08-15 22:53:37.000000000 +0200
yann@339
    17
@@ -53,6 +53,9 @@
yann@339
    18
 #include <ext/memory> // For uninitialized_copy_n
yann@339
    19
 #include <ext/numeric> // For power
yann@339
    20
 
yann@339
    21
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339
    22
+#undef index
yann@339
    23
+
yann@339
    24
 namespace __gnu_cxx
yann@339
    25
 {
yann@339
    26
   using std::size_t;