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

[Server] change "__arm__" to "__ARM_ARCH" in ARM detection

Browse source
This commit is contained in:
Koncord 2017-06-30 19:31:07 +08:00
parent 15a197cb9a
commit f92117e73d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/Script/ScriptFunction.cpp
View file

@ -6,7 +6,7 @@
#include <stdexcept> #include <stdexcept>
#include "ScriptFunction.hpp" #include "ScriptFunction.hpp"
#if !defined(_WIN32) && !defined(__arm__) // temporarily disabled #if !defined(_WIN32) && !defined(__ARM_ARCH) // temporarily disabled
#include <call.hpp> #include <call.hpp>
#endif #endif
@ -155,7 +155,7 @@ boost::any ScriptFunction::Call(const vector<boost::any> &args)
throw runtime_error("C++ call: Unknown argument identifier " + *it); throw runtime_error("C++ call: Unknown argument identifier " + *it);
} }
} }
#if !defined(_WIN32) && !defined(__arm__) // temporarily disabled #if !defined(_WIN32) && !defined(__ARM_ARCH) // temporarily disabled
Func f = reinterpret_cast<Func>(fCpp); Func f = reinterpret_cast<Func>(fCpp);
result = ::Call(f, callArgs); result = ::Call(f, callArgs);
#else #else