diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:22:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:22:46 +0000 |
| commit | d895db57a7e5f9f6da0ffb23a89d93e1e3c80232 (patch) | |
| tree | 71c0639a174831938c5da24731b06224ed14fbc7 /stlport | |
| parent | 6b9be75f01457d48f69c8617a20992fcf4148f90 (diff) | |
INTEGRATION: CWS macosxgcc4 (1.6.6); FILE MERGED
2005/09/23 19:59:04 fheckl 1.6.6.2: Fixing i49044 (previous patch was partially wrong)
2005/09/19 19:32:38 fheckl 1.6.6.1: Making stlport compatible with gcc4 on MacOSX (i49044)
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/STLport-4.5-macxp-panther.patch | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/stlport/STLport-4.5-macxp-panther.patch b/stlport/STLport-4.5-macxp-panther.patch index 0715dec9b5b8..580efe0b44ac 100644 --- a/stlport/STLport-4.5-macxp-panther.patch +++ b/stlport/STLport-4.5-macxp-panther.patch @@ -1,17 +1,3 @@ ---- misc/STLport-4.5/stlport/stdarg.h 2001-01-27 02:39:59.000000000 +0100 -+++ misc/build/STLport-4.5/stlport/stdarg.h 2005-05-01 19:37:22.000000000 +0200 -@@ -20,7 +20,11 @@ - # define _STLP_DONT_POP_0x261 - # endif - -+#if defined(__GNUC__) && defined(__APPLE__) && (BUILD_OS_MAJOR >= 10) && (BUILD_OS_MINOR >= 4) -+# include _STLP_NATIVE_HEADER(../stdarg.h) -+#else - # include _STLP_NATIVE_C_HEADER(stdarg.h) -+#endif - - # if (_STLP_OUTERMOST_HEADER_ID == 0x261) - # if ! defined (_STLP_DONT_POP_0x261) --- misc/STLport-4.5/stlport/stl/c_locale.h 2001-05-31 05:24:41.000000000 +0200 +++ misc/build/STLport-4.5/stlport/stl/c_locale.h 2005-05-01 23:19:20.000000000 +0200 @@ -290,16 +290,28 @@ @@ -360,7 +346,7 @@ # if defined(__BEOS__) && defined(__INTEL__) ---- 99,121 ---- +--- 99,125 ---- # define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##> # define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##> # define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##> @@ -372,6 +358,10 @@ ! # define _STLP_WEAK_ATTRIBUTE 1 ! # undef _STLP_NO_LONG_DOUBLE ! +! #if __GNUC__ > 3 +! # undef _STLP_NO_MEMBER_TEMPLATE_KEYWORD +! #endif +! ! #if 0 ! /* Mac OS X needs all "::" scope references to be "std::" */ ! # define _STLP_NO_CSTD_FUNCTION_IMPORTS @@ -394,7 +384,7 @@ # elif (__GNUC_MINOR__ < 8) ---- 244,254 ---- +--- 248,258 ---- # if (__GNUC__ >= 3) |