diff options
| author | INADA Naoki <inada-n@klab.com> | 2013-10-20 15:08:31 +0900 |
|---|---|---|
| committer | INADA Naoki <inada-n@klab.com> | 2013-10-20 15:08:31 +0900 |
| commit | 27f0cba8a5f36393517ee85d2c339847b76e0c6b (patch) | |
| tree | 470bc84905240c82d2e1f4e710d55a288661f635 /msgpack/unpack_define.h | |
| parent | 7123341ca89a9a3afee8521cc16a1a419ea8871e (diff) | |
| parent | 6386481024ec045d9ef991a2c975902276812508 (diff) | |
| download | msgpack-python-27f0cba8a5f36393517ee85d2c339847b76e0c6b.tar.gz | |
Merge branch 'master' of https://github.com/antocuni/msgpack-python into newspec
Conflicts:
msgpack/fallback.py
msgpack/unpack.h
msgpack/unpack_define.h
msgpack/unpack_template.h
Diffstat (limited to 'msgpack/unpack_define.h')
| -rw-r--r-- | msgpack/unpack_define.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/msgpack/unpack_define.h b/msgpack/unpack_define.h index 0b14f52..2ee92b5 100644 --- a/msgpack/unpack_define.h +++ b/msgpack/unpack_define.h @@ -45,10 +45,11 @@ typedef enum { CS_BIN_8 = 0x04, CS_BIN_16 = 0x05, CS_BIN_32 = 0x06, - //CS_ = 0x07, - //CS_ = 0x08, - //CS_ = 0x09, + CS_EXT_8 = 0x07, + CS_EXT_16 = 0x08, + CS_EXT_32 = 0x09, + CS_FLOAT = 0x0a, CS_DOUBLE = 0x0b, CS_UINT_8 = 0x0c, @@ -60,6 +61,12 @@ typedef enum { CS_INT_32 = 0x12, CS_INT_64 = 0x13, + //CS_FIXEXT1 = 0x14, + //CS_FIXEXT2 = 0x15, + //CS_FIXEXT4 = 0x16, + //CS_FIXEXT8 = 0x17, + //CS_FIXEXT16 = 0x18, + CS_RAW_8 = 0x19, CS_RAW_16 = 0x1a, CS_RAW_32 = 0x1b, @@ -70,6 +77,7 @@ typedef enum { ACS_RAW_VALUE, ACS_BIN_VALUE, + ACS_EXT_VALUE, } msgpack_unpack_state; |