Add MS_WIN64 macro when built on amd64 + mingw.

1 files changed, 8 insertions, 0 deletions

diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index 3092167c6..5ad8c7fef 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -278,6 +278,14 @@ class build_ext (old_build_ext):
             c_sources += cxx_sources
             cxx_sources = []
 
+        # MS_WIN64 should be defined when building for amd64 on windows, but
+        # python headers define it only for MS compilers, which has all kind of
+        # bad consequences, like using Py_ModuleInit4 instead of
+        # Py_ModuleInit4_64, etc... So we add it here
+        if self.compiler.compiler_type == 'mingw32' and \
+           get_build_architecture() == 'AMD64':
+               macros.append('MS_WIN64')
+
         # Set Fortran/C++ compilers for compilation and linking.
         if ext.language=='f90':
             fcompiler = self._f90_compiler