fix long vs long long bugs

yamt · yamt · commit d1b9ecbc8e33 · 2013-06-03T13:53:47.000+09:00
these bugs were introduced by "fix long/int confusions in pyx version of
unpack" commit.
diff --git 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);
     }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static inline int unpack_callback_uint64(unpack_user* u, uint64_t d, msgpack_unp`
`70`	`70`	`{`
`71`	`71`	`PyObject *p;`
`72`	`72`	`if (d > LONG_MAX) {`
`73`		`- p = PyLong_FromUnsignedLongLong((unsigned long)d);`
	`73`	`+ p = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)d);`
`74`	`74`	`} else {`
`75`	`75`	`p = PyInt_FromLong((long)d);`
`76`	`76`	`}`
`@@ -103,7 +103,7 @@ static inline int unpack_callback_int64(unpack_user* u, int64_t d, msgpack_unpac`
`103`	`103`	`{`
`104`	`104`	`PyObject *p;`
`105`	`105`	`if (d > LONG_MAX \|\| d < LONG_MIN) {`
`106`		`- p = PyLong_FromLongLong((unsigned long)d);`
	`106`	`+ p = PyLong_FromLongLong((unsigned PY_LONG_LONG)d);`
`107`	`107`	`} else {`
`108`	`108`	`p = PyInt_FromLong((long)d);`
`109`	`109`	`}`