Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r1512:ee83f0ac370a Date: 2014-05-30 18:49 +0200 http://bitbucket.org/cffi/cffi/changeset/ee83f0ac370a/
Log: tweak for Windows (msvc versus mingw) diff --git a/c/misc_win32.h b/c/misc_win32.h --- a/c/misc_win32.h +++ b/c/misc_win32.h @@ -222,7 +222,7 @@ typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; -#if !defined(_MSC_VER) || _MSC_VER <= 1700 +#if defined(_MSC_VER) && _MSC_VER <= 1700 typedef unsigned char _Bool; #endif diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py --- a/cffi/vengine_cpy.py +++ b/cffi/vengine_cpy.py @@ -780,7 +780,7 @@ typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; -#if !defined(_MSC_VER) || _MSC_VER <= 1700 +#if defined(_MSC_VER) && _MSC_VER <= 1700 typedef unsigned char _Bool; #endif #else diff --git a/cffi/vengine_gen.py b/cffi/vengine_gen.py --- a/cffi/vengine_gen.py +++ b/cffi/vengine_gen.py @@ -564,7 +564,9 @@ typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; typedef SSIZE_T ssize_t; +#if defined(_MSC_VER) && _MSC_VER <= 1700 typedef unsigned char _Bool; +#endif #else # include <stdint.h> #endif _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
