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

[jan Iversen]

 include/LibreOfficeKit/LibreOfficeKitInit.h                |   10 +++++-----
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c |    2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 028ef4748e53aa8f72c6464ce6bbeeb28c61d30c
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Mar 20 15:38:39 2017 +0100

    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

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index d19aa0fae9ef..ce8daaf28892 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -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
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
index 748c601f268e..539713d95160 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
@@ -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;