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

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKitInit.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3f02b2aa51e32c46d5b6610480bc1ba22156a3ec
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Thu Aug 4 18:08:34 2016 +0200

    LOK init: avoid non-inline function definition in header file
    
    To prevent possible ODR violations.
    
    Change-Id: Ic9538244a0bf3760808904d2bcf608151c53f899
    Reviewed-on: https://gerrit.libreoffice.org/27883
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index bdda642..47b9553 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -42,7 +42,7 @@ extern "C"
     #endif
     #define SEPARATOR         '/'
 
-    void *lok_loadlib(const char *pFN)
+    inline void *lok_loadlib(const char *pFN)
     {
         return dlopen(pFN, RTLD_LAZY
 #if defined LOK_LOADLIB_GLOBAL
@@ -51,22 +51,22 @@ extern "C"
                       );
     }
 
-    char *lok_dlerror(void)
+    inline char *lok_dlerror(void)
     {
         return dlerror();
     }
 
-    void *lok_dlsym(void *Hnd, const char *pName)
+    inline void *lok_dlsym(void *Hnd, const char *pName)
     {
         return dlsym(Hnd, pName);
     }
 
-    int lok_dlclose(void *Hnd)
+    inline int lok_dlclose(void *Hnd)
     {
         return dlclose(Hnd);
     }
 
-    void extendUnoPath(const char *pPath)
+    inline void extendUnoPath(const char *pPath)
     {
         (void)pPath;
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits