Kaydet (Commit) 81765aa7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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: 's avatarTor Lillqvist <tml@collabora.com>
üst 8f0e74ed
...@@ -4251,19 +4251,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -4251,19 +4251,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
return bInitialized; 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 SAL_DLLPUBLIC_EXPORT
#endif
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_url) LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_url)
{ {
if (!gImpl) if (!gImpl)
...@@ -4279,11 +4267,7 @@ LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user ...@@ -4279,11 +4267,7 @@ LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user
return static_cast<LibreOfficeKit*>(gImpl); return static_cast<LibreOfficeKit*>(gImpl);
} }
#if defined(__GNUC__) && defined(DISABLE_DYNLOADING)
__attribute__ ((visibility("default")))
#else
SAL_DLLPUBLIC_EXPORT SAL_DLLPUBLIC_EXPORT
#endif
LibreOfficeKit *libreofficekit_hook(const char* install_path) LibreOfficeKit *libreofficekit_hook(const char* install_path)
{ {
return libreofficekit_hook_2(install_path, nullptr); return libreofficekit_hook_2(install_path, nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment