From: Stefan Behnel Date: Sat, 25 Aug 2007 17:00:31 +0000 (+0200) Subject: merge of 0.9.6.4 X-Git-Tag: 0.9.6.14~29^2~129^2~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63e4116966fef32318d6160d5d88659090bd1b51;p=cython.git merge of 0.9.6.4 --- 63e4116966fef32318d6160d5d88659090bd1b51 diff --cc Cython/Compiler/Nodes.py index 19e62970,86ec00d8..c447968a --- a/Cython/Compiler/Nodes.py +++ b/Cython/Compiler/Nodes.py @@@ -2600,8 -2630,10 +2630,10 @@@ utility_function_predeclarations = typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/ typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/ -typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/ +typedef struct {PyObject **p; char *s; long n; int is_unicode;} __Pyx_StringTabEntry; /*proto*/ + #define __pyx_PyIndex_AsSsize_t(b) PyInt_AsSsize_t(PyNumber_Index(b)) + #define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False)) static INLINE int __Pyx_PyObject_IsTrue(PyObject* x) { if (x == Py_True) return 1; diff --cc Cython/Compiler/Version.py index 54e34e5c,cc9cd1e9..47d6addf --- a/Cython/Compiler/Version.py +++ b/Cython/Compiler/Version.py @@@ -1,1 -1,1 +1,1 @@@ - version = '0.9.6' -version = '0.9.6.3' ++version = '0.9.6.4'