fix for Py_NotImplemented as reported by Olly and Amaury
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8862 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
e66f81f904
commit
52106b3c6e
1 changed files with 24 additions and 10 deletions
|
|
@ -25,7 +25,7 @@ PyString_FromFormat(const char *fmt, ...) {
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
res = vsnprintf(buf, sizeof(buf), fmt, ap);
|
res = vsnprintf(buf, sizeof(buf), fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return (res < 0 || res >= sizeof(buf)) ? 0 : PyString_FromString(buf);
|
return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -39,18 +39,32 @@ PyString_FromFormat(const char *fmt, ...) {
|
||||||
|
|
||||||
/* A crude PyExc_StopIteration exception for old Pythons */
|
/* A crude PyExc_StopIteration exception for old Pythons */
|
||||||
#if PY_VERSION_HEX < 0x02020000
|
#if PY_VERSION_HEX < 0x02020000
|
||||||
|
# ifndef PyExc_StopIteration
|
||||||
# define PyExc_StopIteration PyExc_RuntimeError
|
# define PyExc_StopIteration PyExc_RuntimeError
|
||||||
|
# endif
|
||||||
|
# ifndef PyObject_GenericGetAttr
|
||||||
# define PyObject_GenericGetAttr 0
|
# define PyObject_GenericGetAttr 0
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
/* Py_NotImplemented is defined in 2.1 and up. */
|
||||||
|
#if PY_VERSION_HEX < 0x02010000
|
||||||
|
# ifndef Py_NotImplemented
|
||||||
# define Py_NotImplemented PyExc_RuntimeError
|
# define Py_NotImplemented PyExc_RuntimeError
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* A crude PyString_AsStringAndSize implementation for old Pythons */
|
/* A crude PyString_AsStringAndSize implementation for old Pythons */
|
||||||
#if PY_VERSION_HEX < 0x02010000
|
#if PY_VERSION_HEX < 0x02010000
|
||||||
|
# ifndef PyString_AsStringAndSize
|
||||||
# define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
|
# define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
#if PY_VERSION_HEX < 0x02000000
|
|
||||||
#define PySequence_Size PySequence_Length
|
/* PySequence_Size for old Pythons */
|
||||||
|
#if PY_VERSION_HEX < 0x02000000
|
||||||
|
# ifndef PySequence_Size
|
||||||
|
# define PySequence_Size PySequence_Length
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue