[Server] Fix rebase conflicts

ffi-server-rewrite
Koncord 6 years ago
parent 6a2878820c
commit f24b8b8738

@ -73,7 +73,7 @@ namespace ServerFunctions
* *
* \return The type of the operating system. * \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. * \brief Get the architecture type used by the server.
@ -82,7 +82,7 @@ namespace ServerFunctions
* *
* \return The architecture type. * \return The architecture type.
*/ */
static const char *GetArchitectureType() noexcept; EXPORT_APIFUNCTION const char *CDECL GetArchitectureType() noexcept;
/** /**
* \brief Get the TES3MP version of the server. * \brief Get the TES3MP version of the server.

Loading…
Cancel
Save