Mercurial > vim
changeset 5612:30e300c0b2c1 v7.4.153
updated for version 7.4.153
Problem: Compiler warning for pointer type.
Solution: Add type cast.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 14 Jan 2014 19:35:56 +0100 |
| parents | 53bfbc9e797d |
| children | 1fe648ac0b42 |
| files | src/if_py_both.h src/if_python.c src/if_python3.c src/version.c |
| diffstat | 4 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2326,7 +2326,7 @@ ListItem(ListObject *self, PyObject* idx { Py_ssize_t start, stop, step, slicelen; - if (PySlice_GetIndicesEx(idx, ListLength(self), + if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self), &start, &stop, &step, &slicelen) < 0) return NULL; return ListSlice(self, start, step, slicelen); @@ -2616,7 +2616,7 @@ ListAssItem(ListObject *self, PyObject * { Py_ssize_t start, stop, step, slicelen; - if (PySlice_GetIndicesEx(idx, ListLength(self), + if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self), &start, &stop, &step, &slicelen) < 0) return -1; return ListAssSlice(self, start, step, slicelen,
--- a/src/if_python.c +++ b/src/if_python.c @@ -343,7 +343,7 @@ static PyObject*(*dll_PySequence_Fast)(P static PyInt(*dll_PyTuple_Size)(PyObject *); static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt); static PyTypeObject* dll_PyTuple_Type; -static int (*dll_PySlice_GetIndicesEx)(PyObject *r, PyInt length, +static int (*dll_PySlice_GetIndicesEx)(PySliceObject *r, PyInt length, PyInt *start, PyInt *stop, PyInt *step, PyInt *slicelen); static PyObject*(*dll_PyImport_ImportModule)(const char *);
--- a/src/if_python3.c +++ b/src/if_python3.c @@ -294,7 +294,7 @@ static Py_ssize_t (*py3_PyTuple_Size)(Py static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); static int (*py3_PyMapping_Check)(PyObject *); static PyObject* (*py3_PyMapping_Keys)(PyObject *); -static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, +static int (*py3_PySlice_GetIndicesEx)(PySliceObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelen); static PyObject* (*py3_PyErr_NoMemory)(void); @@ -1190,7 +1190,7 @@ BufferSubscript(PyObject *self, PyObject if (CheckBuffer((BufferObject *) self)) return NULL; - if (PySlice_GetIndicesEx((PyObject *)idx, + if (PySlice_GetIndicesEx((PySliceObject *)idx, (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, &start, &stop, &step, &slicelen) < 0) @@ -1222,7 +1222,7 @@ BufferAsSubscript(PyObject *self, PyObje if (CheckBuffer((BufferObject *) self)) return -1; - if (PySlice_GetIndicesEx((PyObject *)idx, + if (PySlice_GetIndicesEx((PySliceObject *)idx, (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, &start, &stop, &step, &slicelen) < 0) @@ -1306,7 +1306,7 @@ RangeSubscript(PyObject *self, PyObject* { Py_ssize_t start, stop, step, slicelen; - if (PySlice_GetIndicesEx((PyObject *)idx, + if (PySlice_GetIndicesEx((PySliceObject *)idx, ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, &start, &stop, &step, &slicelen) < 0) @@ -1333,7 +1333,7 @@ RangeAsSubscript(PyObject *self, PyObjec { Py_ssize_t start, stop, step, slicelen; - if (PySlice_GetIndicesEx((PyObject *)idx, + if (PySlice_GetIndicesEx((PySliceObject *)idx, ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, &start, &stop, &step, &slicelen) < 0)