move extern "C" to header

lib/CIOSUtils.h

@@ -7,6 +7,12 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <TargetConditionals.h>
 
 #ifdef __OBJC__
@@ -30,3 +36,7 @@ extern const char *ios_bundlePath();
 extern const char *ios_frameworksPath();
 
 extern const char *ios_bundleIdentifier();
+
+#ifdef __cplusplus
+}
+#endif

lib/VCMIDirs.cpp

@@ -375,9 +375,7 @@ bfs::path VCMIDirsApple::userConfigPath() const { return userDataPath() / "confi
 std::string VCMIDirsApple::libraryName(const std::string& basename) const { return "lib" + basename + ".dylib"; }
 
 #ifdef VCMI_IOS
-extern "C" {
 #import "CIOSUtils.h"
-}
 
 class VCMIDirsIOS final : public VCMIDirsApple
 {

lib/logging/CLogger.cpp

@@ -31,8 +31,8 @@ namespace ELogLevel
 	}
 }
 #elif defined(VCMI_IOS)
-extern "C" {
 #import "../CIOSUtils.h"
+extern "C" {
 #include <os/log.h>
 }
 #endif

server/ios/main.mm

@@ -11,9 +11,7 @@
 
 #include "../Global.h"
 #include "CVCMIServer.h"
-extern "C" {
 #import "../lib/CIOSUtils.h"
-}
 
 @interface ViewController : UIViewController
 @property (nonatomic, copy) NSArray<NSURL *> *dataDirsInDocuments;