]>
Commit | Line | Data |
---|---|---|
42c0359e PS |
1 | --- STLport-4.6.1/stlport/config/stl_gcc.h.orig 2003-11-02 09:59:11.000000000 +0100 |
2 | +++ STLport-4.6.1/stlport/config/stl_gcc.h 2004-02-27 18:51:56.250671472 +0100 | |
d03f4076 PS |
3 | @@ -263,18 +263,13 @@ |
4 | ||
5 | # if (__GNUC__ >= 3) | |
6 | ||
7 | -# if ((__GNUC_MINOR__ == 0) || (__APPLE__)) | |
8 | -# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 | |
9 | -# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward | |
10 | -# else | |
42c0359e PS |
11 | # if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0) |
12 | -# define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__ | |
13 | -# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward | |
14 | +# define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__ | |
15 | +# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward | |
16 | # else | |
17 | -# define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__ | |
18 | -# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__/backward | |
19 | +# define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0 | |
20 | +# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0/backward | |
21 | # endif | |
d03f4076 PS |
22 | -# endif |
23 | ||
24 | # elif (__GNUC_MINOR__ < 8) | |
42c0359e PS |
25 | |
26 | --- STLport-4.6.1/stlport/stl/_config.h.orig 2004-02-05 00:29:55.000000000 +0100 | |
27 | +++ STLport-4.6.1/stlport/stl/_config.h 2004-02-27 19:06:50.711692728 +0100 | |
28 | @@ -89,6 +89,8 @@ | |
29 | */ | |
30 | // # include <stl/_check_config.h> | |
31 | ||
32 | +#define _STLP_DONT_USE_NESTED_TCLASS_THROUGHT_TPARAM | |
33 | + | |
34 | /* SGI terms */ | |
35 | ||
36 | # if !defined (_STLP_NO_MEMBER_TEMPLATES) && !defined (_STLP_MEMBER_TEMPLATES) |