diff options
author | INADA Naoki <songofacandy@gmail.com> | 2015-01-07 16:09:39 +0900 |
---|---|---|
committer | INADA Naoki <songofacandy@gmail.com> | 2015-01-07 16:09:39 +0900 |
commit | 868d149efc79ff4f2e992a0ea052b6b79a0af460 (patch) | |
tree | ad689ad3fce06cfb97fd7a101fd7975769ff158d /msgpack | |
parent | 5bc685973d133a6c47f28437d52040ee1ae0f1e5 (diff) | |
parent | 198196c73116120a7ed1108abb3e17a0e971f381 (diff) | |
download | msgpack-python-868d149efc79ff4f2e992a0ea052b6b79a0af460.tar.gz |
Merge branch 'master' of github.com:msgpack/msgpack-python0.4.3
Diffstat (limited to 'msgpack')
-rw-r--r-- | msgpack/_packer.pyx | 3 | ||||
-rw-r--r-- | msgpack/pack.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx index 82e4a63..fcd20a7 100644 --- a/msgpack/_packer.pyx +++ b/msgpack/_packer.pyx @@ -5,7 +5,6 @@ from cpython cimport * from libc.stdlib cimport * from libc.string cimport * from libc.limits cimport * -from libc.stdint cimport int8_t from msgpack.exceptions import PackValueError from msgpack import ExtType @@ -32,7 +31,7 @@ cdef extern from "pack.h": int msgpack_pack_raw(msgpack_packer* pk, size_t l) int msgpack_pack_bin(msgpack_packer* pk, size_t l) int msgpack_pack_raw_body(msgpack_packer* pk, char* body, size_t l) - int msgpack_pack_ext(msgpack_packer* pk, int8_t typecode, size_t l) + int msgpack_pack_ext(msgpack_packer* pk, char typecode, size_t l) cdef int DEFAULT_RECURSE_LIMIT=511 diff --git a/msgpack/pack.h b/msgpack/pack.h index a71c87b..971065c 100644 --- a/msgpack/pack.h +++ b/msgpack/pack.h @@ -71,7 +71,7 @@ static inline int msgpack_pack_raw(msgpack_packer* pk, size_t l); static inline int msgpack_pack_bin(msgpack_packer* pk, size_t l); static inline int msgpack_pack_raw_body(msgpack_packer* pk, const void* b, size_t l); -static inline int msgpack_pack_ext(msgpack_packer* pk, int8_t typecode, size_t l); +static inline int msgpack_pack_ext(msgpack_packer* pk, char typecode, size_t l); static inline int msgpack_pack_write(msgpack_packer* pk, const char *data, size_t l) { |