[Libreoffice-commits] core.git: include/LibreOfficeKit

[jan Iversen]

 include/LibreOfficeKit/LibreOfficeKitInit.h |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 68ca63cf2c830d3a1ddbbcac9cc7edaa23b71c51
Author: jan Iversen <jani at libreoffice.org>
Date:   Sun May 28 13:46:28 2017 +0200

    LibreOfficeKit, changed test for iOS.
    
    Replaced __APPLE__ && __arm*__ with
    TARGET_OS_IPHONE, which is set by xCode when compiling for iOS independent of CPU.
    
    Change-Id: Icd3418894841de45c731c21e5211b1cc4ff2e54a
    Reviewed-on: https://gerrit.libreoffice.org/38106
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at libreoffice.org>

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 9da7ad0ee0bd..8206d91f03f3 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -42,7 +42,8 @@ extern "C"
     #endif
     #define SEPARATOR         '/'
 
-    static void *lok_loadlib(const char *pFN)
+#if !defined(TARGET_OS_IPHONE)
+        static void *lok_loadlib(const char *pFN)
     {
         return dlopen(pFN, RTLD_LAZY
 #if defined LOK_LOADLIB_GLOBAL
@@ -56,6 +57,12 @@ extern "C"
         return dlerror();
     }
 
+    static void extendUnoPath(const char *pPath)
+    {
+        (void)pPath;
+    }
+#endif // TARGERT_OS_IPHONE
+
     static void *lok_dlsym(void *Hnd, const char *pName)
     {
         return dlsym(Hnd, pName);
@@ -66,10 +73,6 @@ extern "C"
         return dlclose(Hnd);
     }
 
-    static void extendUnoPath(const char *pPath)
-    {
-        (void)pPath;
-    }
 
 #else
     #pragma warning(disable:4996)
@@ -150,7 +153,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib )
     char *imp_lib;
     void *dlhandle;
 
-#if !(defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)))
+#if !defined(TARGET_OS_IPHONE)
     size_t partial_length, imp_lib_size;
     struct stat dir_st;