- now it builds and works with all versions of gcc3

- yes, this is the cause for those thousands of lines with warnings :->

Changed files:
    STLport-gcc3.patch -> 1.6

diff --git a/STLport-gcc3.patch b/STLport-gcc3.patch
index 7ce9ce36bc6278190459a5c657623ec12f3eee1e..5305c1751ccf570e8eb204aad6a536a247188af0 100644 (file)
--- a/STLport-gcc3.patch
+++ b/STLport-gcc3.patch
@@ -1,19 +1,27 @@
---- STLport-4.5.3/stlport/config/stl_gcc.h.old Fri Oct 18 20:13:00 2002
-+++ STLport-4.5.3/stlport/config/stl_gcc.h     Fri Oct 18 20:14:16 2002
-@@ -249,9 +249,14 @@
- #   endif
+--- STLport-4.5.3/stlport/config/stl_gcc.h.orig        Sun May 11 22:22:12 2003
++++ STLport-4.5.3/stlport/config/stl_gcc.h     Sun May 11 23:05:46 2003
+@@ -250,8 +250,22 @@
  
  # if (__GNUC__ >= 3)
-+# if (__GNUC_MINOR__ >= 2)
-+# define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/3.2.3
-+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/3.2.3/backward
-+# else
  
 -#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
 -#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+# endif
++#  if (__GNUC_MINOR__ >= 2)
++
++#   define tmp_concat6(s,t,u,w,x,y)    tmp_concat6_(s,t,u,w,x,y)
++#   define tmp_concat6_(s,t,u,w,x,y)   s##t##u##w##x##y
++#   define tmp_concat7(s,t,u,w,x,y,z)  tmp_concat7_(s,t,u,w,x,y,z)
++#   define tmp_concat7_(s,t,u,w,x,y,z) s##t##u##w##x##y##z
++
++#   define _STLP_NATIVE_INCLUDE_PATH tmp_concat6(/usr/include/c++/,__GNUC__,.,__GNUC_MINOR__,.,__GNUC_PATCHLEVEL__)
++#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH tmp_concat7(../c++/,__GNUC__,.,__GNUC_MINOR__,.,__GNUC_PATCHLEVEL__,/backward)
++
++#  else
++
++#   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
++
++#  endif
  
  # elif (__GNUC_MINOR__ < 8)