Merge branch 'release-0.4'
This commit is contained in:
@@ -13,10 +13,7 @@ environment:
|
||||
- PYTHON: "C:\\Python27-x64"
|
||||
- PYTHON: "C:\\Python34-x64"
|
||||
DISTUTILS_USE_SDK: "1"
|
||||
|
||||
# Python35-x64 test fails with MemoryError
|
||||
# TODO: investigate it
|
||||
#- PYTHON: "C:\\Python35-x64"
|
||||
- PYTHON: "C:\\Python35-x64"
|
||||
|
||||
install:
|
||||
# We need wheel installed to build wheels
|
||||
|
||||
@@ -265,9 +265,9 @@ static inline int unpack_callback_ext(unpack_user* u, const char* base, const ch
|
||||
}
|
||||
// length also includes the typecode, so the actual data is length-1
|
||||
#if PY_MAJOR_VERSION == 2
|
||||
py = PyObject_CallFunction(u->ext_hook, "(is#)", typecode, pos, length-1);
|
||||
py = PyObject_CallFunction(u->ext_hook, "(is#)", (int)typecode, pos, (Py_ssize_t)length-1);
|
||||
#else
|
||||
py = PyObject_CallFunction(u->ext_hook, "(iy#)", typecode, pos, length-1);
|
||||
py = PyObject_CallFunction(u->ext_hook, "(iy#)", (int)typecode, pos, (Py_ssize_t)length-1);
|
||||
#endif
|
||||
if (!py)
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user