- patched for 3.3 with patchlevel == 0

Changed files:
    STLport-gcc3.patch -> 1.7

diff --git a/STLport-gcc3.patch b/STLport-gcc3.patch
index 5305c1751ccf570e8eb204aad6a536a247188af0..ee6c430bb8f743e068267b180ee59fd094c30b03 100644 (file)
--- a/STLport-gcc3.patch
+++ b/STLport-gcc3.patch
@@ -8,13 +8,13 @@
 -#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
 +#  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)
++#    if (__GNUC_PATCHLEVEL__ != 0)
++#      define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
++#      define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
++#    else
++#      define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__
++#      define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/__GNUC__.__GNUC_MINOR__/backward
++#    endif
 +
 +#  else
 +