teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Fix rebase conflicts

Browse source
This commit is contained in:
Koncord 2019-01-03 02:50:38 +08:00
parent 10d7e68dd5
commit 7bbf81b74d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/Script/Functions/Server.hpp
View file

@ -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.

6
apps/openmw-mp/Script/LangLua/LangLua.hpp
View file

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