diff options
author | Armin Rigo <arigo@tunes.org> | 2015-05-16 13:57:37 +0200 |
---|---|---|
committer | Armin Rigo <arigo@tunes.org> | 2015-05-16 13:57:37 +0200 |
commit | b1d9274f92a9dfada58e87545ec4e7254042e892 (patch) | |
tree | c94f0367c75d9802f426c616434e982307f04709 | |
parent | fd2fd2b61ad1132cce718012b6056e55cd428bc8 (diff) | |
download | cffi-b1d9274f92a9dfada58e87545ec4e7254042e892.tar.gz |
Bump the internal version number
-rw-r--r-- | c/cffi1_module.c | 4 | ||||
-rw-r--r-- | cffi/recompiler.py | 6 | ||||
-rw-r--r-- | demo/manual.c | 7 | ||||
-rw-r--r-- | demo/manual2.py | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/c/cffi1_module.c b/c/cffi1_module.c index f107e4c..1fd6965 100644 --- a/c/cffi1_module.c +++ b/c/cffi1_module.c @@ -126,8 +126,8 @@ static PyObject *_my_Py_InitModule(char *module_name) #endif } -#define CFFI_VERSION_MIN 0x2600 -#define CFFI_VERSION_MAX 0x260F +#define CFFI_VERSION_MIN 0x2601 +#define CFFI_VERSION_MAX 0x26FF static PyObject *b_init_cffi_1_0_external_module(PyObject *self, PyObject *arg) { diff --git a/cffi/recompiler.py b/cffi/recompiler.py index 734d07c..4aa8c48 100644 --- a/cffi/recompiler.py +++ b/cffi/recompiler.py @@ -375,7 +375,7 @@ class Recompiler: prnt('PyMODINIT_FUNC') prnt('_cffi_pypyinit_%s(const void *p[])' % (base_module_name,)) prnt('{') - prnt(' p[0] = (const void *)0x2600;') + prnt(' p[0] = (const void *)0x2601;') prnt(' p[1] = &_cffi_type_context;') prnt('}') # on Windows, distutils insists on putting init_cffi_xyz in @@ -393,14 +393,14 @@ class Recompiler: prnt('PyMODINIT_FUNC') prnt('PyInit_%s(void)' % (base_module_name,)) prnt('{') - prnt(' return _cffi_init("%s", 0x2600, &_cffi_type_context);' % ( + prnt(' return _cffi_init("%s", 0x2601, &_cffi_type_context);' % ( self.module_name,)) prnt('}') prnt('#else') prnt('PyMODINIT_FUNC') prnt('init%s(void)' % (base_module_name,)) prnt('{') - prnt(' _cffi_init("%s", 0x2600, &_cffi_type_context);' % ( + prnt(' _cffi_init("%s", 0x2601, &_cffi_type_context);' % ( self.module_name,)) prnt('}') prnt('#endif') diff --git a/demo/manual.c b/demo/manual.c index 38539b8..5b360e8 100644 --- a/demo/manual.c +++ b/demo/manual.c @@ -154,16 +154,13 @@ static const struct _cffi_type_context_s _cffi_type_context = { PyMODINIT_FUNC initmanual(void) { - if (_cffi_init() < 0) - return; - - _cffi_init_module("manual", &_cffi_type_context); + _cffi_init("manual", 0x2601, &_cffi_type_context); } #else PyMODINIT_FUNC _cffi_pypyinit_manual(const void *p[]) { - p[0] = (const void *)0x10000f0; + p[0] = (const void *)0x2601; p[1] = &_cffi_type_context; } #endif diff --git a/demo/manual2.py b/demo/manual2.py index d5c49b0..2986244 100644 --- a/demo/manual2.py +++ b/demo/manual2.py @@ -1,7 +1,7 @@ import _cffi_backend ffi = _cffi_backend.FFI(b"manual2", - _version = 0x2600, + _version = 0x2601, _types = b'\x00\x00\x01\x0D\x00\x00\x07\x01\x00\x00\x00\x0F\x00\x00\x00\x09\x00\x00\x00\x0B\x00\x00\x01\x03', _globals = (b'\xff\xff\xff\x0bAA',0,b'\xff\xff\xff\x0bBB',-1,b'\xff\xff\xff\x0bCC',2,b'\xff\xff\xff\x1fFOO',0x9999999999999999,b'\x00\x00\x00#close',0,b'\x00\x00\x05#stdout',0), _struct_unions = ((b'\x00\x00\x00\x03\x00\x00\x00\x00point_s',b'\x00\x00\x01\x11\xff\xff\xff\xffx',b'\x00\x00\x01\x11\xff\xff\xff\xffy'),), |