[Libreoffice-commits] online.git: bundled/include

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Mar 27 07:23:34 UTC 2019


 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3791ebace315e4a20f5769980213a1fc03188519
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 27 09:22:49 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 27 09:23:08 2019 +0200

    Update to match core master
    
    Change-Id: I9670676db84cbce949bf230d62f9c1f7666fe09f

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 5dbf2f83f..c00c33193 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -249,13 +249,13 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const char
 
 typedef int             (LokHookPreInit)  ( const char *install_path, const char *user_profile_url );
 
-#if defined(IOS)
+#if defined(IOS) || defined(ANDROID)
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_path);
 #endif
 
 static LibreOfficeKit *lok_init_2( const char *install_path,  const char *user_profile_url )
 {
-#if !defined(IOS)
+#if !defined(IOS) && !defined(ANDROID)
     void *dlhandle;
     char *imp_lib;
     LokHookFunction *pSym;


More information about the Libreoffice-commits mailing list