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

[Tor Lillqvist]

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

New commits:
commit 50e19b71a63741cfa353fdfdbb13c41784bfc55f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 18 09:39:28 2016 +0300

    Better fix for Objective-C
    
    Not sure what the exact mechanism of the problem is, but anyway, this
    helps.
    
    Change-Id: I5812381af0e4f12fcbdd06eafb1eedc170ffb608

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index bbef7d5..15b9a67 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -51,22 +51,34 @@ extern "C"
                       );
     }
 
-    inline char *lok_dlerror(void)
+#ifndef __OBJC__
+    inline
+#endif
+    char *lok_dlerror(void)
     {
         return dlerror();
     }
 
-    inline void *lok_dlsym(void *Hnd, const char *pName)
+#ifndef __OBJC__
+    inline
+#endif
+    void *lok_dlsym(void *Hnd, const char *pName)
     {
         return dlsym(Hnd, pName);
     }
 
-    inline int lok_dlclose(void *Hnd)
+#ifndef __OBJC__
+    inline
+#endif
+    int lok_dlclose(void *Hnd)
     {
         return dlclose(Hnd);
     }
 
-    inline void extendUnoPath(const char *pPath)
+#ifndef __OBJC__
+    inline
+#endif
+    void extendUnoPath(const char *pPath)
     {
         (void)pPath;
     }