aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.4.153

Browse Source 
Problem:    Compiler warning for pointer type.
Solution:   Add type cast.
This commit is contained in:
Bram Moolenaar
2014-01-14 19:35:56 +01:00
parent 1028f4d75e
commit 5395e7afe9
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/if_py_both.h
View File

@@ -2326,7 +2326,7 @@ ListItem(ListObject *self, PyObject* idx)
{ {
Py_ssize_t start, stop, step, slicelen; 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) &start, &stop, &step, &slicelen) < 0)
return NULL; return NULL;
return ListSlice(self, start, step, slicelen); return ListSlice(self, start, step, slicelen);
@@ -2616,7 +2616,7 @@ ListAssItem(ListObject *self, PyObject *idx, PyObject *obj)
{ {
Py_ssize_t start, stop, step, slicelen; 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) &start, &stop, &step, &slicelen) < 0)
return -1; return -1;
return ListAssSlice(self, start, step, slicelen, return ListAssSlice(self, start, step, slicelen,

2
src/if_python.c
View File

@@ -343,7 +343,7 @@ static PyObject*(*dll_PySequence_Fast)(PyObject *, const char *);
static PyInt(*dll_PyTuple_Size)(PyObject *); static PyInt(*dll_PyTuple_Size)(PyObject *);
static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt); static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt);
static PyTypeObject* dll_PyTuple_Type; 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 *start, PyInt *stop, PyInt *step,
PyInt *slicelen); PyInt *slicelen);
static PyObject*(*dll_PyImport_ImportModule)(const char *); static PyObject*(*dll_PyImport_ImportModule)(const char *);

10
src/if_python3.c
View File

@@ -294,7 +294,7 @@ static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
static int (*py3_PyMapping_Check)(PyObject *); static int (*py3_PyMapping_Check)(PyObject *);
static PyObject* (*py3_PyMapping_Keys)(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 *start, Py_ssize_t *stop, Py_ssize_t *step,
Py_ssize_t *slicelen); Py_ssize_t *slicelen);
static PyObject* (*py3_PyErr_NoMemory)(void); static PyObject* (*py3_PyErr_NoMemory)(void);
@@ -1190,7 +1190,7 @@ BufferSubscript(PyObject *self, PyObject* idx)
if (CheckBuffer((BufferObject *) self)) if (CheckBuffer((BufferObject *) self))
return NULL; return NULL;
if (PySlice_GetIndicesEx((PyObject *)idx, if (PySlice_GetIndicesEx((PySliceObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop, &start, &stop,
&step, &slicelen) < 0) &step, &slicelen) < 0)
@@ -1222,7 +1222,7 @@ BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val)
if (CheckBuffer((BufferObject *) self)) if (CheckBuffer((BufferObject *) self))
return -1; return -1;
if (PySlice_GetIndicesEx((PyObject *)idx, if (PySlice_GetIndicesEx((PySliceObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop, &start, &stop,
&step, &slicelen) < 0) &step, &slicelen) < 0)
@@ -1306,7 +1306,7 @@ RangeSubscript(PyObject *self, PyObject* idx)
{ {
Py_ssize_t start, stop, step, slicelen; Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx, if (PySlice_GetIndicesEx((PySliceObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop, &start, &stop,
&step, &slicelen) < 0) &step, &slicelen) < 0)
@@ -1333,7 +1333,7 @@ RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val)
{ {
Py_ssize_t start, stop, step, slicelen; Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx, if (PySlice_GetIndicesEx((PySliceObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop, &start, &stop,
&step, &slicelen) < 0) &step, &slicelen) < 0)

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
153,
/**/ /**/
152, 152,
/**/ /**/