mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibreOfficeKitInit.h modified to avoid ODR.

Browse Source 
As discussed in IRC, the prev. version would cause an ODR

the use of _cplusplus have been changed to IOS_SWIFTCBRIDGE

Change-Id: If18610858cb56780347bb28f909619db4aac85b0
This commit is contained in:
jan Iversen
2017-03-20 15:38:39 +01:00
parent e5d8be3271
commit 028ef4748e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/LibreOfficeKit/LibreOfficeKitInit.h
View File

@@ -43,7 +43,7 @@ extern "C"
#define SEPARATOR '/' #define SEPARATOR '/'
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus #ifndef IOS_SWIFTCBRIDGE
inline inline
#endif #endif
#endif #endif
@@ -57,7 +57,7 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus #ifndef IOS_SWIFTCBRIDGE
inline inline
#endif #endif
#endif #endif
@@ -67,7 +67,7 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus #ifndef IOS_SWIFTCBRIDGE
inline inline
#endif #endif
#endif #endif
@@ -77,7 +77,7 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus #ifndef IOS_SWIFTCBRIDGE
inline inline
#endif #endif
#endif #endif
@@ -87,7 +87,7 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus #ifndef IOS_SWIFTCBRIDGE
inline inline
#endif #endif
#endif #endif

2
ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
View File

@@ -7,7 +7,9 @@
// //
#include <stdio.h> #include <stdio.h>
#define LOK_USE_UNSTABLE_API #define LOK_USE_UNSTABLE_API
#define IOS_SWIFTCBRIDGE
#include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKitInit.h>
#undef IOS_SWIFTCBRIDGE
// pointers to our instance // pointers to our instance
static LibreOfficeKit* kit; static LibreOfficeKit* kit;