blob: b4b2db6079a4577b9c307e16070d8b7c6d23a194 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- STLport-4.6.2/stlport/config/stl_gcc.h
+++ STLport-4.6.2/stlport/config/stl_gcc.h
@@ -7,7 +7,9 @@
# define _STLP_USE_GLIBC
#endif
+#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4)
# define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+#endif
# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
# define _STLP_NO_WCHAR_T
@@ -263,7 +265,12 @@
# if (__GNUC__ >= 3)
-# if ((__GNUC_MINOR__ == 0) || (__APPLE__))
+# if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__))
+# if __GNUC__ >= 4
+# define _STLP_NATIVE_INCLUDE_PATH ../g++-v4
+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v4/backward
+# else
# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+# endif
# else
|
GitWeb
