patches/gcc/4.3.4/290-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Jan 26 00:04:41 2011 +0100 (2011-01-26)
branch1.9
changeset 2291 075510bba768
permissions -rw-r--r--
libc/mingw: do not remove support symlink

Under mingw, it seems that there is a mix between the traditional /usr
directory, and a similar-purposed /mingw directory (both in the sysroot).

Currently, we create /mingw as a symlink to /usr, and we removed it in
the libc-finish step.

Unfortunately, this prevents the pre-processor to find the headers.
Keeping the symlink makes it magically work...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from fa5c70b11fecf390c78780fe8f8ba0a836a59e92)
thomas@1461
     1
Original patch from: ../4.3.2/290-index_macro.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
thomas@1461
     5
-= END original header =-
thomas@1461
     6
thomas@1461
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
thomas@1461
     8
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
thomas@1461
     9
+++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    10
@@ -59,6 +59,9 @@
thomas@1461
    11
 #include <bits/gthr.h>
thomas@1461
    12
 #include <tr1/functional>
thomas@1461
    13
 
thomas@1461
    14
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    15
+#undef index
thomas@1461
    16
+
thomas@1461
    17
 # ifdef __GC
thomas@1461
    18
 #   define __GC_CONST const
thomas@1461
    19
 # else
thomas@1461
    20
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
thomas@1461
    21
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
thomas@1461
    22
+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    23
@@ -54,6 +54,9 @@
thomas@1461
    24
 #include <ext/memory> // For uninitialized_copy_n
thomas@1461
    25
 #include <ext/numeric> // For power
thomas@1461
    26
 
thomas@1461
    27
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    28
+#undef index
thomas@1461
    29
+
thomas@1461
    30
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
thomas@1461
    31
 
thomas@1461
    32
   using std::size_t;