[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

New commits:
commit 4a3484af6d6b259d4a5b0fa93c7d83ece6f175b7
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Aug 18 10:58:01 2015 +0100

    Cleanup symbol export conditionals.
    
    Change-Id: Ic25500637f1748bf117bafd7483d589729a2e658

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a33922f..88a2f06 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1063,19 +1063,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
     return bInitialized;
 }
 
-// Undo our clever trick of having SAL_DLLPUBLIC_EXPORT actually not
-// meaning what is says in for the DISABLE_DYNLOADING case. See
-// <sal/types.h>. Normally, when building just one big dylib (Android)
-// or executable (iOS), most of our "public" symbols don't need to be
-// visible outside that resulting dylib/executable. But
-// libreofficekit_hook must be exported for dlsym() to find it,
-// though, at least on iOS.
-
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+// SAL_JNI_EXPORT to handle DISABLE_DYNLOADING case.
+
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_path)
 {
     if (!gImpl)
@@ -1091,21 +1081,13 @@ LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user
     return static_cast<LibreOfficeKit*>(gImpl);
 }
 
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook(const char* install_path)
 {
     return libreofficekit_hook_2(install_path, NULL);
 }
 
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+SAL_JNI_EXPORT
 int lok_preinit()
 {
     SAL_INFO("lok", "Hello World");