diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-04 18:08:34 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-05 14:32:46 +0200 |
commit | 1dd03826d3c17af500731550e14acd4b694b1bd9 (patch) | |
tree | 569f69b19aa0415e1c77db918ebca0a3f005163a | |
parent | e3d57b2c8219fff9653120558eb363ebc5672e3e (diff) |
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 <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3f02b2aa51e32c46d5b6610480bc1ba22156a3ec)
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitInit.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index 2ab7d181c3fb..6190d728ecfa 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 __clang__ && defined __linux__ \ @@ -54,22 +54,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; } |