diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-22 08:47:23 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-22 08:47:23 (GMT) |
| commit | 02743ca0146c2cbedfeb0c05d7f3731fab281575 (patch) | |
| tree | 622693d71db97d3fa8010291d710540138ff0a5c | |
| parent | 3a23017bb2309f6ba44090fb322f9681bf49c4c3 (diff) | |
| download | cpython-02743ca0146c2cbedfeb0c05d7f3731fab281575.zip cpython-02743ca0146c2cbedfeb0c05d7f3731fab281575.tar.gz cpython-02743ca0146c2cbedfeb0c05d7f3731fab281575.tar.bz2 | |
Mostly revert this file to the same version as before. Only force setting
of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define
to use. This should get rid of the warnings on other platforms and Mac too.
| -rw-r--r-- | Include/pyport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index 16ee011..8f8e514 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -126,10 +126,10 @@ typedef Py_intptr_t Py_ssize_t; * Py_ssize_t on the platform. */ #ifndef PY_FORMAT_SIZE_T -# if SIZEOF_SIZE_T == SIZEOF_LONG -# define PY_FORMAT_SIZE_T "l" -# elif SIZEOF_SIZE_T == SIZEOF_INT +# if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__) # define PY_FORMAT_SIZE_T "" +# elif SIZEOF_SIZE_T == SIZEOF_LONG +# define PY_FORMAT_SIZE_T "l" # elif defined(MS_WINDOWS) # define PY_FORMAT_SIZE_T "I" # else |