diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:14:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:14:31 +0000 |
| commit | 167987e27c67ebea44316c997cf6e1a821499a08 (patch) | |
| tree | 8447e1e8a3544784f0d14b4523109dc76bda3ea8 /tools/bootstrp | |
| parent | 849cb52dfe480c4455e8da2293c75ae2690affc3 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.8.34); FILE MERGED
2003/07/14 14:22:49 fa 1.8.34.1: The Time::Time( const Time& ) constructor and the = operator confused the
Apple compiler somehwhat, so that it created bad exception-handling frame
symbols for them (silly Apple, .eh frames are for kids!), but only when
they were compiled outside the Tools library. Moving them out of the
header and into the tools library itself corrects this. Symptom on
Mac OS X was the linker complaining that these symbols didn't exist,
but were expected to be defined in Security.framework.
Second, for OS X pull the system language/locale from sal functions,
and not from the environment. The tools locale functions are used
in psprint for font language recognition.
http://www.openoffice.org/project/www/issues/showattachment.cgi?attach_id=7554&file=tools.071003.11rc.patch
Dan
fa@ooo
Diffstat (limited to 'tools/bootstrp')
| -rw-r--r-- | tools/bootstrp/cppdep.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx index 242a91e93386..830912b6e560 100644 --- a/tools/bootstrp/cppdep.cxx +++ b/tools/bootstrp/cppdep.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cppdep.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:02:58 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:14:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,12 +72,14 @@ #ifdef UNX #ifdef MACOSX +#if ( __GNUC__ < 3 ) #ifdef BOOTSTRAPPER #include <glibc/posix/getopt.h> #else #include <glibc/getopt.h> #endif #endif +#endif #include <unistd.h> #endif |