summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp>2013-06-03 13:49:44 +0900
committerYAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp>2013-06-03 13:53:47 +0900
commitd1b9ecbc8e33663663f2fb2f13ac17854dd6c8d6 (patch)
treef5724b8446adc4755f6efffe689aa3cf30468290
parent3dbb2d1e7e97a61a9c36e316336552dc0e20577f (diff)
downloadmsgpack-python-d1b9ecbc8e33663663f2fb2f13ac17854dd6c8d6.tar.gz
fix long vs long long bugs
these bugs were introduced by "fix long/int confusions in pyx version of unpack" commit.
-rw-r--r--msgpack/unpack.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
index fb13b4e..baeed1f 100644
--- a/msgpack/unpack.h
+++ b/msgpack/unpack.h
@@ -70,7 +70,7 @@ static inline int unpack_callback_uint64(unpack_user* u, uint64_t d, msgpack_unp
{
PyObject *p;
if (d > LONG_MAX) {
- p = PyLong_FromUnsignedLongLong((unsigned long)d);
+ p = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)d);
} else {
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;
if (d > LONG_MAX || d < LONG_MIN) {
- p = PyLong_FromLongLong((unsigned long)d);
+ p = PyLong_FromLongLong((unsigned PY_LONG_LONG)d);
} else {
p = PyInt_FromLong((long)d);
}