diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-06-30 13:21:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-06-30 13:21:08 +0200 |
| commit | e721122b792698096b1c7fd5641e61fa37231408 (patch) | |
| tree | 4ad8c02ce39acb473dea2e25f54368efb682ed89 | |
| parent | 49346f4155b01a3d73f575f49359dd108eda939f (diff) | |
| download | vim-git-e721122b792698096b1c7fd5641e61fa37231408.tar.gz | |
updated for version 7.3.583v7.3.583
Problem: PyObject_NextNotImplemented is not defined before Python 2.7.
(Danek Duvall)
Solution: Add #ifdefs.
| -rw-r--r-- | src/if_python.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/if_python.c b/src/if_python.c index 374ad2ce6..6674df729 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -214,7 +214,9 @@ struct PyMethodDef { Py_ssize_t a; }; # define Py_Finalize dll_Py_Finalize # define Py_IsInitialized dll_Py_IsInitialized # define _PyObject_New dll__PyObject_New -# define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented) +# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 +# define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented) +# endif # define _Py_NoneStruct (*dll__Py_NoneStruct) # define PyObject_Init dll__PyObject_Init # define PyObject_GetIter dll_PyObject_GetIter @@ -310,7 +312,9 @@ static int(*dll_Py_IsInitialized)(void); static PyObject*(*dll__PyObject_New)(PyTypeObject *, PyObject *); static PyObject*(*dll__PyObject_Init)(PyObject *, PyTypeObject *); static PyObject* (*dll_PyObject_GetIter)(PyObject *); +# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 static iternextfunc dll__PyObject_NextNotImplemented; +# endif static PyObject* dll__Py_NoneStruct; # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); @@ -430,7 +434,9 @@ static struct {"_PyObject_New", (PYTHON_PROC*)&dll__PyObject_New}, {"PyObject_Init", (PYTHON_PROC*)&dll__PyObject_Init}, {"PyObject_GetIter", (PYTHON_PROC*)&dll_PyObject_GetIter}, +# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&dll__PyObject_NextNotImplemented}, +# endif {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct}, # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype}, diff --git a/src/version.c b/src/version.c index 30583f777..f9d2eda7c 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 583, +/**/ 582, /**/ 581, |