Mercurial > vim

comparison src/if_python3.c @ 14262:281c1e6e17ea v8.1.0147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0147: compiler warning when building with Python 3.7 commit https://github.com/vim/vim/commit/3b48b11c07b85520f4ca3566e92c3f6486509b72 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 4 22:03:25 2018 +0200 patch 8.1.0147: compiler warning when building with Python 3.7 Problem: Compiler warning when building with Python 3.7. Solution: #undef PySlice_GetIndicesEx before redefining it. (Ozaki Kiichi, closes #3153)
author Christian Brabandt <cb@256bit.org>
date Wed, 04 Jul 2018 22:15:06 +0200
parents 76a65058766f
children 27b9a84395b5
comparison
equal deleted inserted replaced
14261:72c39d84dc3e 14262:281c1e6e17ea
165 # define PySequence_Size py3_PySequence_Size 165 # define PySequence_Size py3_PySequence_Size
166 # define PySequence_GetItem py3_PySequence_GetItem 166 # define PySequence_GetItem py3_PySequence_GetItem
167 # define PySequence_Fast py3_PySequence_Fast 167 # define PySequence_Fast py3_PySequence_Fast
168 # define PyTuple_Size py3_PyTuple_Size 168 # define PyTuple_Size py3_PyTuple_Size
169 # define PyTuple_GetItem py3_PyTuple_GetItem 169 # define PyTuple_GetItem py3_PyTuple_GetItem
170 # if PY_VERSION_HEX >= 0x030601f0
171 # define PySlice_AdjustIndices py3_PySlice_AdjustIndices
172 # define PySlice_Unpack py3_PySlice_Unpack
173 # endif
174 # undef PySlice_GetIndicesEx
170 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx 175 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
171 # define PyImport_ImportModule py3_PyImport_ImportModule 176 # define PyImport_ImportModule py3_PyImport_ImportModule
172 # define PyObject_Init py3__PyObject_Init 177 # define PyObject_Init py3__PyObject_Init
173 # define PyDict_New py3_PyDict_New 178 # define PyDict_New py3_PyDict_New
174 # define PyDict_GetItemString py3_PyDict_GetItemString 179 # define PyDict_GetItemString py3_PyDict_GetItemString
303 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); 308 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *);
304 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); 309 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
305 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); 310 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
306 static int (*py3_PyMapping_Check)(PyObject *); 311 static int (*py3_PyMapping_Check)(PyObject *);
307 static PyObject* (*py3_PyMapping_Keys)(PyObject *); 312 static PyObject* (*py3_PyMapping_Keys)(PyObject *);
313 # if PY_VERSION_HEX >= 0x030601f0
314 static int (*py3_PySlice_AdjustIndices)(Py_ssize_t length,
315 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step);
316 static int (*py3_PySlice_Unpack)(PyObject *slice,
317 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
318 # endif
308 static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length, 319 static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length,
309 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, 320 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
310 Py_ssize_t *slicelen); 321 Py_ssize_t *slicelen);
311 static PyObject* (*py3_PyErr_NoMemory)(void); 322 static PyObject* (*py3_PyErr_NoMemory)(void);
312 static void (*py3_Py_Finalize)(void); 323 static void (*py3_Py_Finalize)(void);
472 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, 483 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size},
473 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, 484 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem},
474 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast}, 485 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast},
475 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, 486 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size},
476 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem}, 487 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem},
488 # if PY_VERSION_HEX >= 0x030601f0
489 {"PySlice_AdjustIndices", (PYTHON_PROC*)&py3_PySlice_AdjustIndices},
490 {"PySlice_Unpack", (PYTHON_PROC*)&py3_PySlice_Unpack},
491 # endif
477 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, 492 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
478 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, 493 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
479 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, 494 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
480 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, 495 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
481 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, 496 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject},