projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8bb52fd3 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.583 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.583 | |
| 11 | Problem: PyObject_NextNotImplemented is not defined before Python 2.7. | |
| 12 | (Danek Duvall) | |
| 13 | Solution: Add #ifdefs. | |
| 14 | Files: src/if_python.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.582/src/if_python.c 2012-06-29 19:14:48.000000000 +0200 | |
| 18 | --- src/if_python.c 2012-06-30 12:59:38.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 214,220 **** | |
| 21 | # define Py_Finalize dll_Py_Finalize | |
| 22 | # define Py_IsInitialized dll_Py_IsInitialized | |
| 23 | # define _PyObject_New dll__PyObject_New | |
| 24 | ! # define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented) | |
| 25 | # define _Py_NoneStruct (*dll__Py_NoneStruct) | |
| 26 | # define PyObject_Init dll__PyObject_Init | |
| 27 | # define PyObject_GetIter dll_PyObject_GetIter | |
| 28 | --- 214,222 ---- | |
| 29 | # define Py_Finalize dll_Py_Finalize | |
| 30 | # define Py_IsInitialized dll_Py_IsInitialized | |
| 31 | # define _PyObject_New dll__PyObject_New | |
| 32 | ! # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 | |
| 33 | ! # define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented) | |
| 34 | ! # endif | |
| 35 | # define _Py_NoneStruct (*dll__Py_NoneStruct) | |
| 36 | # define PyObject_Init dll__PyObject_Init | |
| 37 | # define PyObject_GetIter dll_PyObject_GetIter | |
| 38 | *************** | |
| 39 | *** 310,316 **** | |
| 40 | --- 312,320 ---- | |
| 41 | static PyObject*(*dll__PyObject_New)(PyTypeObject *, PyObject *); | |
| 42 | static PyObject*(*dll__PyObject_Init)(PyObject *, PyTypeObject *); | |
| 43 | static PyObject* (*dll_PyObject_GetIter)(PyObject *); | |
| 44 | + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 | |
| 45 | static iternextfunc dll__PyObject_NextNotImplemented; | |
| 46 | + # endif | |
| 47 | static PyObject* dll__Py_NoneStruct; | |
| 48 | # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 | |
| 49 | static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); | |
| 50 | *************** | |
| 51 | *** 430,436 **** | |
| 52 | --- 434,442 ---- | |
| 53 | {"_PyObject_New", (PYTHON_PROC*)&dll__PyObject_New}, | |
| 54 | {"PyObject_Init", (PYTHON_PROC*)&dll__PyObject_Init}, | |
| 55 | {"PyObject_GetIter", (PYTHON_PROC*)&dll_PyObject_GetIter}, | |
| 56 | + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000 | |
| 57 | {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&dll__PyObject_NextNotImplemented}, | |
| 58 | + # endif | |
| 59 | {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct}, | |
| 60 | # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 | |
| 61 | {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype}, | |
| 62 | *** ../vim-7.3.582/src/version.c 2012-06-29 23:57:50.000000000 +0200 | |
| 63 | --- src/version.c 2012-06-30 13:20:46.000000000 +0200 | |
| 64 | *************** | |
| 65 | *** 716,717 **** | |
| 66 | --- 716,719 ---- | |
| 67 | { /* Add new patch number below this line */ | |
| 68 | + /**/ | |
| 69 | + 583, | |
| 70 | /**/ | |
| 71 | ||
| 72 | -- | |
| 73 | hundred-and-one symptoms of being an internet addict: | |
| 74 | 90. Instead of calling you to dinner, your spouse sends e-mail. | |
| 75 | ||
| 76 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 77 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 78 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 79 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |