From f92117e73da97515597f314998013a65d49bd086 Mon Sep 17 00:00:00 2001 From: Koncord Date: Fri, 30 Jun 2017 19:31:07 +0800 Subject: [PATCH] [Server] change "__arm__" to "__ARM_ARCH" in ARM detection --- apps/openmw-mp/Script/ScriptFunction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw-mp/Script/ScriptFunction.cpp b/apps/openmw-mp/Script/ScriptFunction.cpp index b04435356..6d30d2129 100644 --- a/apps/openmw-mp/Script/ScriptFunction.cpp +++ b/apps/openmw-mp/Script/ScriptFunction.cpp @@ -6,7 +6,7 @@ #include #include "ScriptFunction.hpp" -#if !defined(_WIN32) && !defined(__arm__) // temporarily disabled +#if !defined(_WIN32) && !defined(__ARM_ARCH) // temporarily disabled #include #endif @@ -155,7 +155,7 @@ boost::any ScriptFunction::Call(const vector &args) 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(fCpp); result = ::Call(f, callArgs); #else