diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:26:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:26:32 +0000 |
| commit | 43002abc7840b9ae3b68e8000762676d78c0ee28 (patch) | |
| tree | 32f797692e714d3180f21ed43ca7dfdef7c49486 /registry/source | |
| parent | 0c608accda333a56c18eb45d821edc0f3e7aa160 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.11.4); FILE MERGED
2003/07/14 14:26:09 fa 1.11.4.1: Conditionalize OS X + gcc 2.95 hacks for only gcc 2.95.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16630
Dan
fa@ooo
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/registry.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index e3ee6184cd4d..9fa0ab17d588 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2003-06-12 10:03:22 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:26:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ using namespace salhelper; ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; #endif -#if defined(MACOSX) +#if defined(MACOSX) && ( __GNUC__ < 3 ) ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pStaticLoader = NULL; #endif |