From 587e9c2d15119927c89d052835ce495af9ff7d19 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 20 Mar 2017 21:45:35 +0100 Subject: Consistently mark function definitions in LibreOfficeKitInit.h as static ...to give them internal linkage in both C and C++. Of those definitions that were not marked as static: * Those that had not been marked as inline had external linkage in both C and C++, so would have caused ODR violations were LibreOfficeKitInit.h included in multiple translation units. * Those that had been marked as inline lacked an external defintion in C. (Which 3f02b2aa51e32c46d5b6610480bc1ba22156a3ec "LOK init: avoid non-inline function definition in header file" had apparently faied to take into account.) (IOS_SWIFTCBRIDGE introduced in 028ef4748e53aa8f72c6464ce6bbeeb28c61d30c "LibreOfficeKitInit.h modified to avoid ODR" becomes unnecessary again.) Change-Id: Ibb8033cdbac87b20fa0e3b203b99571c1a7e7234 Reviewed-on: https://gerrit.libreoffice.org/35491 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ios') diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c index 539713d95160..748c601f268e 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c @@ -7,9 +7,7 @@ // #include #define LOK_USE_UNSTABLE_API -#define IOS_SWIFTCBRIDGE #include -#undef IOS_SWIFTCBRIDGE // pointers to our instance static LibreOfficeKit* kit; -- cgit