- forgotten about TODO list, removed

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

diff --git a/STLport-gcc3.patch b/STLport-gcc3.patch
index 5e2cfc4e62a675cd6c280d85a023e5595a53a53d..ee6c430bb8f743e068267b180ee59fd094c30b03 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.2
-+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/3.2.2/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)
++
++#    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
++
++#   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
++
++#  endif
  
  # elif (__GNUC_MINOR__ < 8)