From 7bbf81b74db88daedb46b314334f7efacd77ff2b Mon Sep 17 00:00:00 2001
From: Koncord <koncord@rwa.su>
Date: Thu, 3 Jan 2019 02:50:38 +0800
Subject: [PATCH] [Server] Fix rebase conflicts

---
 apps/openmw-mp/Script/Functions/Server.hpp | 4 ++--
 apps/openmw-mp/Script/LangLua/LangLua.hpp  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw-mp/Script/Functions/Server.hpp b/apps/openmw-mp/Script/Functions/Server.hpp
index aee959acd..ace63a6dc 100644
--- a/apps/openmw-mp/Script/Functions/Server.hpp
+++ b/apps/openmw-mp/Script/Functions/Server.hpp
@@ -77,7 +77,7 @@ namespace ServerFunctions
     *
     * \return The type of the operating system.
     */
-    static const char *GetOperatingSystemType() noexcept;
+    EXPORT_APIFUNCTION const char *CDECL GetOperatingSystemType() noexcept;
 
     /**
     * \brief Get the architecture type used by the server.
@@ -86,7 +86,7 @@ namespace ServerFunctions
     *
     * \return The architecture type.
     */
-    static const char *GetArchitectureType() noexcept;
+    EXPORT_APIFUNCTION const char *CDECL GetArchitectureType() noexcept;
 
     /**
     * \brief Get the TES3MP version of the server.
diff --git a/apps/openmw-mp/Script/LangLua/LangLua.hpp b/apps/openmw-mp/Script/LangLua/LangLua.hpp
index 2de5ae2f5..95a9c74fd 100644
--- a/apps/openmw-mp/Script/LangLua/LangLua.hpp
+++ b/apps/openmw-mp/Script/LangLua/LangLua.hpp
@@ -45,12 +45,12 @@ public:
     virtual bool IsCallbackPresent(const char *name) override;
     virtual boost::any Call(const char *name, const char *argl, int buf, ...) override;
     virtual boost::any Call(const char *name, const char *argl, const std::vector<boost::any> &args) override;
-private:
-    static std::set<std::string> packageCPath;
-    static std::set<std::string> packagePath;
 
     static void Init();
     static void Free();
+private:
+    static std::set<std::string> packageCPath;
+    static std::set<std::string> packagePath;
 };