patches/gcc/4.3.3/290-index_macro.patch
author Andreas Bießmann <andreas@biessmann.de>
Tue Mar 18 17:01:10 2014 +0100 (2014-03-18)
changeset 3296 d3a628e69a46
permissions -rw-r--r--
configure.ac: respect 'g' variants of libtool/libtoolize

BSD OS'es (OS X for me) provide GNU tools with prefixed 'g'. To find correct
versions of libtool/libtoolize on those systems search also for
glibtool/glibtoolize.

Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: search for the g-variant first]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <2f1530b54afcb6a00e1d.1395158786@andreas-mbp.er.biessmann.org>
Patchwork-Id: 331467
yann@1162
     1
Original patch from: ../4.3.2/290-index_macro.patch
yann@1162
     2
yann@1162
     3
-= BEGIN original header =-
yann@1162
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
yann@1162
     5
-= END original header =-
yann@1162
     6
yann@1162
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
yann@1162
     8
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
yann@1162
     9
+++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
yann@1162
    10
@@ -59,6 +59,9 @@
yann@1162
    11
 #include <bits/gthr.h>
yann@1162
    12
 #include <tr1/functional>
yann@1162
    13
 
yann@1162
    14
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1162
    15
+#undef index
yann@1162
    16
+
yann@1162
    17
 # ifdef __GC
yann@1162
    18
 #   define __GC_CONST const
yann@1162
    19
 # else
yann@1162
    20
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
yann@1162
    21
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
yann@1162
    22
+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
yann@1162
    23
@@ -54,6 +54,9 @@
yann@1162
    24
 #include <ext/memory> // For uninitialized_copy_n
yann@1162
    25
 #include <ext/numeric> // For power
yann@1162
    26
 
yann@1162
    27
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1162
    28
+#undef index
yann@1162
    29
+
yann@1162
    30
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@1162
    31
 
yann@1162
    32
   using std::size_t;