Commit 2764fcdc authored by Stefan Behnel's avatar Stefan Behnel

always set CYTHON_FORMAT_SSIZE_T to 'z' on Py2.5+

parent b46f58d6
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#define PY_SSIZE_T_MAX INT_MAX #define PY_SSIZE_T_MAX INT_MAX
#define PY_SSIZE_T_MIN INT_MIN #define PY_SSIZE_T_MIN INT_MIN
#define PY_FORMAT_SIZE_T "" #define PY_FORMAT_SIZE_T ""
#define CYTHON_FORMAT_SSIZE_T ""
#define PyInt_FromSsize_t(z) PyInt_FromLong(z) #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
#define PyInt_AsSsize_t(o) __Pyx_PyInt_AsInt(o) #define PyInt_AsSsize_t(o) __Pyx_PyInt_AsInt(o)
#define PyNumber_Index(o) ((PyNumber_Check(o) && !PyFloat_Check(o)) ? PyNumber_Int(o) : \ #define PyNumber_Index(o) ((PyNumber_Check(o) && !PyFloat_Check(o)) ? PyNumber_Int(o) : \
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
#define __PYX_BUILD_PY_SSIZE_T "i" #define __PYX_BUILD_PY_SSIZE_T "i"
#else #else
#define __PYX_BUILD_PY_SSIZE_T "n" #define __PYX_BUILD_PY_SSIZE_T "n"
#define CYTHON_FORMAT_SSIZE_T "z"
#endif #endif
#if PY_VERSION_HEX < 0x02060000 #if PY_VERSION_HEX < 0x02060000
...@@ -244,18 +246,6 @@ ...@@ -244,18 +246,6 @@
#define __Pyx_DOCSTR(n) (n) #define __Pyx_DOCSTR(n) (n)
#endif #endif
#if defined(_WIN64) && defined(_MSC_VER)
// CPython misdefines the format as "I", but the
// "ll" prefix is only supported in Py2.7 and later
#if PY_VERSION_HEX >= 0x02070000
#define CYTHON_FORMAT_SSIZE_T "ll"
#else
#define CYTHON_FORMAT_SSIZE_T "z"
#endif
#else
#define CYTHON_FORMAT_SSIZE_T PY_FORMAT_SIZE_T
#endif
/////////////// ForceInitThreads.proto /////////////// /////////////// ForceInitThreads.proto ///////////////
#ifndef __PYX_FORCE_INIT_THREADS #ifndef __PYX_FORCE_INIT_THREADS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment