This commit was manufactured by cvs2git to create branch 'AC-branch'.

[packages/STLport.git] / STLport-gcc34.patch

diff --git a/STLport-gcc34.patch b/STLport-gcc34.patch
index 710a62b7eb435cf536193dc90c39a6d6a7a18b2f..e7b979fc95cfd4218172ae498f4a402c8e1b4af4 100644 (file)
--- a/STLport-gcc34.patch
+++ b/STLport-gcc34.patch
@@ -1,8 +1,13 @@
 --- STLport-4.6.1/stlport/config/stl_gcc.h.orig        2003-11-02 09:59:11.000000000 +0100
 +++ STLport-4.6.1/stlport/config/stl_gcc.h     2004-02-27 18:51:56.250671472 +0100
-@@ -268,11 +268,11 @@
- #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
- #  else
+@@ -263,18 +263,13 @@
+ 
+ # if (__GNUC__ >= 3)
+ 
+-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
+-#   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+-#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+-#  else
  #   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
 -#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
 -#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
@@ -14,7 +19,9 @@
 +#     define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0
 +#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0/backward
  #   endif
- #  endif
+-#  endif
+ 
+ # elif (__GNUC_MINOR__ < 8)
  
 --- STLport-4.6.1/stlport/stl/_config.h.orig   2004-02-05 00:29:55.000000000 +0100
 +++ STLport-4.6.1/stlport/stl/_config.h        2004-02-27 19:06:50.711692728 +0100