LibreOfficeKitInit.h modified to avoid ODR.
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:
@@ -43,7 +43,7 @@ extern "C"
|
||||
#define SEPARATOR '/'
|
||||
|
||||
#ifndef __OBJC__
|
||||
#ifdef __cplusplus
|
||||
#ifndef IOS_SWIFTCBRIDGE
|
||||
inline
|
||||
#endif
|
||||
#endif
|
||||
@@ -57,7 +57,7 @@ extern "C"
|
||||
}
|
||||
|
||||
#ifndef __OBJC__
|
||||
#ifdef __cplusplus
|
||||
#ifndef IOS_SWIFTCBRIDGE
|
||||
inline
|
||||
#endif
|
||||
#endif
|
||||
@@ -67,7 +67,7 @@ extern "C"
|
||||
}
|
||||
|
||||
#ifndef __OBJC__
|
||||
#ifdef __cplusplus
|
||||
#ifndef IOS_SWIFTCBRIDGE
|
||||
inline
|
||||
#endif
|
||||
#endif
|
||||
@@ -77,7 +77,7 @@ extern "C"
|
||||
}
|
||||
|
||||
#ifndef __OBJC__
|
||||
#ifdef __cplusplus
|
||||
#ifndef IOS_SWIFTCBRIDGE
|
||||
inline
|
||||
#endif
|
||||
#endif
|
||||
@@ -87,7 +87,7 @@ extern "C"
|
||||
}
|
||||
|
||||
#ifndef __OBJC__
|
||||
#ifdef __cplusplus
|
||||
#ifndef IOS_SWIFTCBRIDGE
|
||||
inline
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -7,7 +7,9 @@
|
||||
//
|
||||
#include <stdio.h>
|
||||
#define LOK_USE_UNSTABLE_API
|
||||
#define IOS_SWIFTCBRIDGE
|
||||
#include <LibreOfficeKit/LibreOfficeKitInit.h>
|
||||
#undef IOS_SWIFTCBRIDGE
|
||||
|
||||
// pointers to our instance
|
||||
static LibreOfficeKit* kit;
|
||||
|
Reference in New Issue
Block a user