diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-09-04 06:10:51 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-09-04 06:10:51 +0000 |
commit | 68d7dfb51c1d8064765f445548b038417c7a4795 (patch) | |
tree | 07a0b4f92c5289968175ba54dba3d4fc82513e0a | |
parent | 0759211421be95591f8c1a29f5d5a41c185f2d04 (diff) |
INTEGRATION: CWS hotmac_DEV300 (1.6.4.1.8); FILE MERGED
2008/08/27 07:43:21 kr 1.6.4.1.8.1: #i92388#
-rw-r--r-- | sal/rtl/source/alloc_global.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c index d756028df..5645bd056 100644 --- a/sal/rtl/source/alloc_global.c +++ b/sal/rtl/source/alloc_global.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: alloc_global.c,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -149,7 +149,18 @@ rtl_memory_init (void) /* ================================================================= */ -#if defined(__GNUC__) +/* + Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388 + + Mac OS X does not seem to support "__cxa__atexit", thus leading + to the situation that "__attribute__((destructor))__" functions + (in particular "rtl_memory_fini") become called _before_ global + C++ object d'tors. + + Delegated the call to "rtl_memory_fini" into a dummy C++ object, + see memory_fini.cxx . +*/ +#if defined(__GNUC__) && !defined(MACOSX) static void rtl_memory_fini (void) __attribute__((destructor)); #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) #pragma fini(rtl_memory_fini) |