[pypy-commit] cffi default: Don't check MS_WIN32, it's not always defined even on MSVC.

arigo noreply at buildbot.pypy.org
Tue Jun 24 17:35:29 CEST 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1525:53be22eb427a
Date: 2014-06-24 17:09 +0200
http://bitbucket.org/cffi/cffi/changeset/53be22eb427a/

Log:	Don't check MS_WIN32, it's not always defined even on MSVC.

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -16,7 +16,7 @@
 
 /* this block of #ifs should be kept exactly identical between
    c/_cffi_backend.c, cffi/vengine_cpy.py, cffi/vengine_gen.py */
-#if defined(MS_WIN32) && defined(_MSC_VER)
+#if defined(_MSC_VER)
 # include <malloc.h>   /* for alloca() */
 # if _MSC_VER < 1600   /* MSVC < 2010 */
    typedef __int8 int8_t;
diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py
--- a/cffi/vengine_cpy.py
+++ b/cffi/vengine_cpy.py
@@ -772,7 +772,7 @@
 
 /* this block of #ifs should be kept exactly identical between
    c/_cffi_backend.c, cffi/vengine_cpy.py, cffi/vengine_gen.py */
-#if defined(MS_WIN32) && defined(_MSC_VER)
+#if defined(_MSC_VER)
 # include <malloc.h>   /* for alloca() */
 # if _MSC_VER < 1600   /* MSVC < 2010 */
    typedef __int8 int8_t;
diff --git a/cffi/vengine_gen.py b/cffi/vengine_gen.py
--- a/cffi/vengine_gen.py
+++ b/cffi/vengine_gen.py
@@ -554,7 +554,7 @@
 
 /* this block of #ifs should be kept exactly identical between
    c/_cffi_backend.c, cffi/vengine_cpy.py, cffi/vengine_gen.py */
-#if defined(MS_WIN32) && defined(_MSC_VER)
+#if defined(_MSC_VER)
 # include <malloc.h>   /* for alloca() */
 # if _MSC_VER < 1600   /* MSVC < 2010 */
    typedef __int8 int8_t;


More information about the pypy-commit mailing list