[Libreoffice-commits] .: Branch 'libreoffice-3-5' - jvmfwk/plugins

[Thorsten Behrens]

 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 5b335c0b71ffa7e875c93690476a778c93591ad3
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Dec 7 18:23:00 2011 +0100

    Fix nasty ppc ld crash, correct default return param setting
    
     * on OSX 10.5 PPC, ld crashes with a bus error, presumably because
       of the empty ar[] string array.
     * the "size = 0" default case looks wrong, replaced by *size=0

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 864dc2d..3de9019 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -87,11 +87,9 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
 char const* const* OtherInfo::getLibraryPaths(int* size)
 {
 
-#ifdef UNX
+#if defined(UNX) && !defined(MACOSX)
+    //mac version does not have a ld library path anymore
     static char const * ar[] = {
-#ifdef MACOSX
-        //mac version does not have a ld library path anymore
-#else
         "/bin",
         "/jre/bin",
         "/bin/classic",
@@ -102,13 +100,12 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
         "/lib/" JFW_PLUGIN_ARCH "/jrockit",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         "/lib/" JFW_PLUGIN_ARCH
-#endif
     };
 
     *size = sizeof(ar) / sizeof (char*);
     return ar;
 #else
-    size = 0;
+    *size = 0;
     return NULL;
 #endif
 }