[[ Bug 22379 ]] Ignore foreign handler C calling convention on 64-bit Windows

Ian Macphail · Ian Macphail · commit 2ea734277192 · 2020-04-29T15:44:40.000+01:00
This patch fixes bug 22379, where foreign handlers declared in LCB
would fail to resolve if the foreign handler binding specified a
calling convention on 64-bit Windows. As there is only one calling
convention in 64-bit Windows, it is safe to ignore such declarations
in that case, allowing the same bindings to work for both 32-bit and
64-bit engine variants.
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -1267,10 +1267,10 @@ bool MCScriptForeignHandlerInfoParse(MCStringRef p_binding, MCScriptForeignHandl
         {
             t_info->thread_affinity = t_thread_affinity;
         
-            /* The ABI for all platforms is always DEFAULT, except on Win32 where
-             * it is specified as part of the signature. */
+            /* The ABI for all platforms is always DEFAULT, except on 32-bit Win32
+             * where it is specified as part of the signature. */
             t_info->c.call_type = (int)FFI_DEFAULT_ABI;
-#ifdef _WIN32
+#if defined(_WIN32) && defined(__32_BIT__)
             t_info->c.call_type = t_cc == 0 ? (int)FFI_DEFAULT_ABI : t_cc;
 #endif
             t_info->c.function = t_function.Take();
