Merge pull request msgpack#116 from msgpack/fix-0_4_3-regression

methane · methane · commit ed30acb934af · 2015-01-09T04:30:24.000+09:00
Fix compile error on _packer
diff --git a/.travis.yml b/.travis.yml
@@ -7,4 +7,4 @@ install:
     - pip install tox cython
     - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
 
-script: "tox && MSGPACK_PUREPYTHON=x tox"
+script: tox
diff --git a/msgpack/pack_template.h b/msgpack/pack_template.h
@@ -712,7 +712,7 @@ static inline int msgpack_pack_raw_body(msgpack_packer* x, const void* b, size_t
 /*
  * Ext
  */
-static inline int msgpack_pack_ext(msgpack_packer* x, int8_t typecode, size_t l)
+static inline int msgpack_pack_ext(msgpack_packer* x, char typecode, size_t l)
 {
     if (l == 1) {
         unsigned char buf[2];
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,15 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,pypy,pypy3
+envlist = {py26,py27,py32,py33,py34}-{c,pure},{pypy,pypy3}-pure
+
+[variants:pure]
+setenv=
+    MSGPACK_PUREPYTHON=x
 
 [testenv]
 deps=
     pytest
 
-commands=py.test test
+changedir=test
+commands=
+    c: python -c 'from msgpack import _packer, _unpacker' && py.test
+    pure: py.test

Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ static inline int msgpack_pack_raw_body(msgpack_packer* x, const void* b, size_t`
`712`	`712`	`/*`
`713`	`713`	`* Ext`
`714`	`714`	`*/`
`715`		`-static inline int msgpack_pack_ext(msgpack_packer* x, int8_t typecode, size_t l)`
	`715`	`+static inline int msgpack_pack_ext(msgpack_packer* x, char typecode, size_t l)`
`716`	`716`	`{`
`717`	`717`	`if (l == 1) {`
`718`	`718`	`unsigned char buf[2];`