diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2012-12-02 13:21:37 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2012-12-02 13:21:37 (GMT) |
| commit | 6e61d18891baf0c173464ae37464ec995889080a (patch) | |
| tree | d53dc6a35a5de9abd272177a6860e5d0b2b8d97c /Include | |
| parent | 9a2b26748b73d604d1ec099d07e493b1ed8f020f (diff) | |
| parent | ce31f66a6d23a5df75eb692c2991e7602b2b6571 (diff) | |
| download | cpython-6e61d18891baf0c173464ae37464ec995889080a.zip cpython-6e61d18891baf0c173464ae37464ec995889080a.tar.gz cpython-6e61d18891baf0c173464ae37464ec995889080a.tar.bz2 | |
Issue 10052: merge fix from 3.2.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pyport.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index 13d1004..41d9d42 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -87,9 +87,12 @@ Used in: PY_LONG_LONG * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t. * However, it doesn't set HAVE_UINT32_T, so we do that here. */ -#if (defined UINT32_MAX || defined uint32_t) -#ifndef PY_UINT32_T +#ifdef uint32_t #define HAVE_UINT32_T 1 +#endif + +#ifdef HAVE_UINT32_T +#ifndef PY_UINT32_T #define PY_UINT32_T uint32_t #endif #endif @@ -97,23 +100,33 @@ Used in: PY_LONG_LONG /* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the * long integer implementation, when 30-bit digits are enabled. */ -#if (defined UINT64_MAX || defined uint64_t) -#ifndef PY_UINT64_T +#ifdef uint64_t #define HAVE_UINT64_T 1 +#endif + +#ifdef HAVE_UINT64_T +#ifndef PY_UINT64_T #define PY_UINT64_T uint64_t #endif #endif /* Signed variants of the above */ -#if (defined INT32_MAX || defined int32_t) -#ifndef PY_INT32_T +#ifdef int32_t #define HAVE_INT32_T 1 +#endif + +#ifdef HAVE_INT32_T +#ifndef PY_INT32_T #define PY_INT32_T int32_t #endif #endif -#if (defined INT64_MAX || defined int64_t) -#ifndef PY_INT64_T + +#ifdef int64_t #define HAVE_INT64_T 1 +#endif + +#ifdef HAVE_INT64_T +#ifndef PY_INT64_T #define PY_INT64_T int64_t #endif #endif |