Merge branch 'master' of github.com:msgpack/msgpack-python

methane · methane · commit 868d149efc79 · 2015-01-07T16:09:39.000+09:00
diff --git 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
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static inline int msgpack_pack_raw(msgpack_packer* pk, size_t l);`
`71`	`71`	`static inline int msgpack_pack_bin(msgpack_packer* pk, size_t l);`
`72`	`72`	`static inline int msgpack_pack_raw_body(msgpack_packer* pk, const void* b, size_t l);`
`73`	`73`
`74`		`-static inline int msgpack_pack_ext(msgpack_packer* pk, int8_t typecode, size_t l);`
	`74`	`+static inline int msgpack_pack_ext(msgpack_packer* pk, char typecode, size_t l);`
`75`	`75`
`76`	`76`	`static inline int msgpack_pack_write(msgpack_packer* pk, const char *data, size_t l)`
`77`	`77`	`{`