| d8621708 |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.048 |
| 3 | Fcc: outbox |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> |
| 5 | Mime-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | ------------ |
| 9 | |
| 10 | Patch 6.2.048 |
| 11 | Problem: The Python interface doesn't compile with Python 2.3 when |
| 12 | dynamically loaded. |
| 13 | Solution: Use dll_PyObject_Malloc and dll_PyObject_Free. (Paul Moore) |
| 14 | Files: src/if_python.c |
| 15 | |
| 16 | |
| 17 | *** ../vim-6.2.047/src/if_python.c Fri Jul 25 22:28:06 2003 |
| 18 | --- src/if_python.c Sat Jul 26 20:05:39 2003 |
| 19 | *************** |
| 20 | *** 111,116 **** |
| 21 | --- 111,120 ---- |
| 22 | # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 |
| 23 | # define PyType_IsSubtype dll_PyType_IsSubtype |
| 24 | # endif |
| 25 | + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000 |
| 26 | + # define PyObject_Malloc dll_PyObject_Malloc |
| 27 | + # define PyObject_Free dll_PyObject_Free |
| 28 | + # endif |
| 29 | |
| 30 | /* |
| 31 | * Pointers for dynamic link |
| 32 | *************** |
| 33 | *** 156,161 **** |
| 34 | --- 160,169 ---- |
| 35 | # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 |
| 36 | static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
| 37 | # endif |
| 38 | + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000 |
| 39 | + static void* (*dll_PyObject_Malloc)(size_t); |
| 40 | + static void (*dll_PyObject_Free)(void*); |
| 41 | + # endif |
| 42 | |
| 43 | static HINSTANCE hinstPython = 0; /* Instance of python.dll */ |
| 44 | |
| 45 | *************** |
| 46 | *** 222,227 **** |
| 47 | --- 230,239 ---- |
| 48 | {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct}, |
| 49 | # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000 |
| 50 | {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype}, |
| 51 | + # endif |
| 52 | + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000 |
| 53 | + {"PyObject_Malloc", (PYTHON_PROC*)&dll_PyObject_Malloc}, |
| 54 | + {"PyObject_Free", (PYTHON_PROC*)&dll_PyObject_Free}, |
| 55 | # endif |
| 56 | {"", NULL}, |
| 57 | }; |
| 58 | *** ../vim-6.2.047/src/version.c Sun Jul 27 14:29:34 2003 |
| 59 | --- src/version.c Sun Jul 27 14:31:02 2003 |
| 60 | *************** |
| 61 | *** 632,633 **** |
| 62 | --- 632,635 ---- |
| 63 | { /* Add new patch number below this line */ |
| 64 | + /**/ |
| 65 | + 48, |
| 66 | /**/ |
| 67 | |
| 68 | -- |
| 69 | It is too bad that the speed of light hasn't kept pace with the |
| 70 | changes in CPU speed and network bandwidth. -- <wietse@porcupine.org> |
| 71 | |
| 72 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| 73 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ |
| 74 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// |
| 75 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |
projects / packages / vim.git / blame