[pypy-commit] cffi default: issue #154: Mingw32 fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1507:494ce4e8d9f2
Date: 2014-04-26 10:34 +0200
http://bitbucket.org/cffi/cffi/changeset/494ce4e8d9f2/

Log:	issue #154: Mingw32 fixes

diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -38,6 +38,7 @@
     import distutils.errors
     #
     dist = Distribution({'ext_modules': [ext]})
+    dist.parse_config_files()
     options = dist.get_option_dict('build_ext')
     options['force'] = ('ffiplatform', True)
     options['build_lib'] = ('ffiplatform', tmpdir)
diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py
--- a/cffi/vengine_cpy.py
+++ b/cffi/vengine_cpy.py
@@ -770,7 +770,7 @@
 #include <Python.h>
 #include <stddef.h>
 
-#ifdef MS_WIN32
+#if defined(MS_WIN32) && !defined(_STDINT_H)
 #include <malloc.h>   /* for alloca() */
 typedef __int8 int8_t;
 typedef __int16 int16_t;