diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-01-14 19:35:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-01-14 19:35:56 +0100 |
| commit | 5395e7afe93d38793dcd6520b277ec0d3b1882ac (patch) | |
| tree | fadf9ada5e4b1e29d938d8bf765ffcebcf292643 | |
| parent | 1028f4d75ee04261f1338620c22f388a05098bb0 (diff) | |
| download | vim-git-5395e7afe93d38793dcd6520b277ec0d3b1882ac.tar.gz | |
updated for version 7.4.153v7.4.153
Problem: Compiler warning for pointer type.
Solution: Add type cast.
| -rw-r--r-- | src/if_py_both.h | 4 | ||||
| -rw-r--r-- | src/if_python.c | 2 | ||||
| -rw-r--r-- | src/if_python3.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 01cbe418c..4d81a4b92 100644 --- 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 *idx, PyObject *obj) { 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, diff --git a/src/if_python.c b/src/if_python.c index 92510b367..02dc8ed38 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -343,7 +343,7 @@ static PyObject*(*dll_PySequence_Fast)(PyObject *, const char *); 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 *); diff --git a/src/if_python3.c b/src/if_python3.c index 55779e79b..99781fcc8 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -294,7 +294,7 @@ static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); 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* idx) 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, PyObject* idx, PyObject* val) 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* idx) { 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, PyObject *idx, PyObject *val) { 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) diff --git a/src/version.c b/src/version.c index 8a472146d..3c4d5e1a7 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 153, +/**/ 152, /**/ 151, |