summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-31 17:22:23 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-31 17:22:23 +0000
commitd1c22ab694610d5d41ef2063468ce924b129f4d1 (patch)
tree8a759cd806124add80a83e5499498a127f0aa63b /stlport
parent02f5223fcad55d29234b19c609505a6f77f5336e (diff)
INTEGRATION: CWS pj49 (1.7.14); FILE MERGED
2006/01/21 17:57:54 pjanik 1.7.14.1: #i49044#: gcc-3.3 on Mac OS X Panther is searching for include files in different location.
Diffstat (limited to 'stlport')
-rw-r--r--stlport/STLport-4.5-macxp-panther.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/stlport/STLport-4.5-macxp-panther.patch b/stlport/STLport-4.5-macxp-panther.patch
index 580efe0b44ac..b7d5b9148cad 100644
--- a/stlport/STLport-4.5-macxp-panther.patch
+++ b/stlport/STLport-4.5-macxp-panther.patch
@@ -1,3 +1,17 @@
+--- 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) && (__GNUC__ == 3)
++# 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 @@