[Libreoffice-commits] .: sal/osl

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jul 25 02:33:46 PDT 2012


 sal/osl/unx/util.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4f1e5b34211a714baad8a05ab38f3f953ebd4cce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 25 10:32:01 2012 +0100

    weak symbols don't link on macosx
    
    Change-Id: If4e8adfb4199863cd2f6d8d8a419762fcbaa6599

diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index b344f2b..eca61a8 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -349,7 +349,8 @@ void osl_interlockedCountCheckForSingleCPU(void)
 #endif /* defined(_SC_NPROCESSORS_CONF) */
 #endif
 
-#if defined(__GNUC__)
+//might be useful on other platforms, but doesn't compiler under MACOSX anyway
+#if defined(__GNUC__) && defined(LINUX)
 //force the __data_start symbol to exist in any executables that link against
 //libuno_sal so that dlopening of the libgcj provided libjvm.so on some
 //platforms where it needs that symbol will succeed. e.g. Debian mips/lenny


More information about the Libreoffice-commits mailing list