summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-11-02 23:39:44 +0200
committerTor Lillqvist <tml@collabora.com>2018-11-03 15:31:46 +0100
commit81765aa741d14dd14eba598d402c138240b23efb (patch)
tree2489047697312d6ac1dc3104b1f446d0f1080a88 /desktop
parent8f0e74ed6d363c6eee6874872742721ef8ae4a36 (diff)
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/62796 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx16
1 files changed, 0 insertions, 16 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fca76934088c..2496f9285c05 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4251,19 +4251,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_url)
{
if (!gImpl)
@@ -4279,11 +4267,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);