Merge pull request #125 from gokhanettin/mingw64-masm

Fix wrong platform inclusion for mingw64
python-greenlet · Jan 29, 2018 · d6015a8 · d6015a8
2 parents 780a12b + d53fb20
commit d6015a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/platform/switch_x64_msvc.h b/platform/switch_x64_msvc.h
@@ -22,7 +22,10 @@
  *      Initial final version after lots of iterations for i386.
  */
 
+/* Avoid alloca redefined warning on mingw64 */
+#ifndef alloca
 #define alloca _alloca
+#endif
 
 #define STACK_REFPLUS 1
 #define STACK_MAGIC 0

diff --git a/slp_platformselect.h b/slp_platformselect.h
@@ -4,7 +4,7 @@
 
 #if   defined(MS_WIN32) && !defined(MS_WIN64) && defined(_M_IX86) && defined(_MSC_VER)
 #include "platform/switch_x86_msvc.h" /* MS Visual Studio on X86 */
-#elif defined(MS_WIN64) && defined(_M_X64) && defined(_MSC_VER)
+#elif defined(MS_WIN64) && defined(_M_X64) && defined(_MSC_VER) || defined(__MINGW64__)
 #include "platform/switch_x64_msvc.h" /* MS Visual Studio on X64 */
 #elif defined(__GNUC__) && defined(__amd64__) && defined(__ILP32__)
 #include "platform/switch_x32_unix.h" /* gcc on amd64 with x32 ABI */