summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2015-01-09 04:30:24 +0900
committerINADA Naoki <methane@users.noreply.github.com>2015-01-09 04:30:24 +0900
commited30acb934af41625a18ec6f8bdb604ec4b4ad35 (patch)
treea89c4fde02a334624c01dc1429f5cba83396eded
parent868d149efc79ff4f2e992a0ea052b6b79a0af460 (diff)
parent715fcac6c6e2bf95a3d074ba186bd6fb106ee312 (diff)
downloadmsgpack-python-ed30acb934af41625a18ec6f8bdb604ec4b4ad35.tar.gz
Merge pull request #116 from msgpack/fix-0_4_3-regression
Fix compile error on _packer
-rw-r--r--.travis.yml2
-rw-r--r--msgpack/pack_template.h2
-rw-r--r--tox.ini11
3 files changed, 11 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 29f1b7d..1bf6d4f 100644
--- 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
index 2879bbd..5d1088f 100644
--- 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
index 892684d..8f10b15 100644
--- 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