[Server] Fix rebase conflicts

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.

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;
 };