From 72198fe92cbb6ea8b492d3674dd6fae0c2791a5f Mon Sep 17 00:00:00 2001 From: pascalek Date: Sat, 12 Jul 2003 15:52:20 +0000 Subject: [PATCH] - patched for 3.3 with patchlevel == 0 Changed files: STLport-gcc3.patch -> 1.7 --- STLport-gcc3.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/STLport-gcc3.patch b/STLport-gcc3.patch index 5305c17..ee6c430 100644 --- 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 + -- 2.44.0