home *** CD-ROM | disk | FTP | other *** search
- To: vim-dev@vim.org
- Subject: Patch 6.0.240
- Fcc: outbox
- From: Bram Moolenaar <Bram@moolenaar.net>
- MIME-Version: 1.0
- Content-Type: text/plain; charset=ISO-8859-1
- Content-Transfer-Encoding: 8bit
- ------------
-
- Patch 6.0.240
- Problem: Win32: building with Python 2.2 doesn't work.
- Solution: Add support for Python 2.2 with dynamic linking. (Paul Moore)
- Files: src/if_python.c
-
-
- *** ../vim60.239/src/if_python.c Sun Nov 4 14:31:23 2001
- --- src/if_python.c Fri Jan 11 09:53:29 2002
- ***************
- *** 107,112 ****
- --- 107,115 ----
- # define _PyObject_New dll__PyObject_New
- # define _Py_NoneStruct (*dll__Py_NoneStruct)
- # define PyObject_Init dll__PyObject_Init
- + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
- + # define PyType_IsSubtype dll_PyType_IsSubtype
- + # endif
-
- /*
- * Pointers for dynamic link
- ***************
- *** 148,153 ****
- --- 151,159 ----
- static PyObject*(*dll__PyObject_New)(PyTypeObject *, PyObject *);
- static PyObject*(*dll__PyObject_Init)(PyObject *, PyTypeObject *);
- static PyObject* dll__Py_NoneStruct;
- + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
- + static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
- + # endif
-
- static HINSTANCE hinstPython = 0; /* Instance of python.dll */
-
- ***************
- *** 211,216 ****
- --- 217,225 ----
- {"_PyObject_New", (PYTHON_PROC*)&dll__PyObject_New},
- {"PyObject_Init", (PYTHON_PROC*)&dll__PyObject_Init},
- {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct},
- + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
- + {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype},
- + # endif
- {"", NULL},
- };
-
- *** ../vim60.239/src/version.c Wed Feb 20 20:51:35 2002
- --- src/version.c Wed Feb 20 21:19:17 2002
- ***************
- *** 608,609 ****
- --- 608,611 ----
- { /* Add new patch number below this line */
- + /**/
- + 240,
- /**/
-
- --
- BEDEVERE: And what do you burn, apart from witches?
- FOURTH VILLAGER: ... Wood?
- BEDEVERE: So why do witches burn?
- SECOND VILLAGER: (pianissimo) ... Because they're made of wood...?
- "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
-
- /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\
- /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\
- \\\ Project leader for A-A-P -- http://www.a-a-p.org ///
- \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///
-