openstack/deb-msgpack-python
Code Issues Proposed changes

fix long vs long long bugs

Browse Source 
these bugs were introduced by "fix long/int confusions in pyx version of
unpack" commit.
This commit is contained in:
YAMAMOTO Takashi
2013-06-03 13:49:44 +09:00
parent 3dbb2d1e7e
commit d1b9ecbc8e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msgpack/unpack.h
View File

@@ -70,7 +70,7 @@ static inline int unpack_callback_uint64(unpack_user* u, uint64_t d, msgpack_unp
{ {
PyObject *p; PyObject *p;
if (d > LONG_MAX) { if (d > LONG_MAX) {
p = PyLong_FromUnsignedLongLong((unsigned long)d); p = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)d);
} else { } else {
p = PyInt_FromLong((long)d); p = PyInt_FromLong((long)d);
} }
@@ -103,7 +103,7 @@ static inline int unpack_callback_int64(unpack_user* u, int64_t d, msgpack_unpac
{ {
PyObject *p; PyObject *p;
if (d > LONG_MAX || d < LONG_MIN) { if (d > LONG_MAX || d < LONG_MIN) {
p = PyLong_FromLongLong((unsigned long)d); p = PyLong_FromLongLong((unsigned PY_LONG_LONG)d);
} else { } else {
p = PyInt_FromLong((long)d); p = PyInt_FromLong((long)d);
} }