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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit d04f9d0a73f167e741c29ad68320e2f49570ccfe
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 2 23:39:44 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 12:58:20 2018 +0100

    On iOS, lok_init_2() links directly to libreofficekit_hook_2()
    
    Thus no need for any special __attribute__ ((visibility("default")))
    dance.
    
    Change-Id: I398d588a0165fd616ea0d259bbf2cab1e1a07ccb
    Reviewed-on: https://gerrit.libreoffice.org/62867
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5269e090979e..8c540eff4923 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4118,19 +4118,7 @@ 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(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
 SAL_DLLPUBLIC_EXPORT
-#endif
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_path)
 {
     if (!gImpl)
@@ -4146,11 +4134,7 @@ LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user
     return static_cast<LibreOfficeKit*>(gImpl);
 }
 
-#if defined(__GNUC__) && defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
 SAL_DLLPUBLIC_EXPORT
-#endif
 LibreOfficeKit *libreofficekit_hook(const char* install_path)
 {
     return libreofficekit_hook_2(install_path, nullptr);