|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.153
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.153
|
|
|
8b9a1c |
Problem: Compiler warning for pointer type.
|
|
|
8b9a1c |
Solution: Add type cast.
|
|
|
8b9a1c |
Files: src/if_py_both.h, src/if_python.c, src/if_python3.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.152/src/if_py_both.h 2014-01-14 16:54:53.000000000 +0100
|
|
|
8b9a1c |
--- src/if_py_both.h 2014-01-14 18:54:47.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 2326,2332 ****
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx(idx, ListLength(self),
|
|
|
8b9a1c |
&start, &stop, &step, &slicelen) < 0)
|
|
|
8b9a1c |
return NULL;
|
|
|
8b9a1c |
return ListSlice(self, start, step, slicelen);
|
|
|
8b9a1c |
--- 2326,2332 ----
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self),
|
|
|
8b9a1c |
&start, &stop, &step, &slicelen) < 0)
|
|
|
8b9a1c |
return NULL;
|
|
|
8b9a1c |
return ListSlice(self, start, step, slicelen);
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 2616,2622 ****
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx(idx, ListLength(self),
|
|
|
8b9a1c |
&start, &stop, &step, &slicelen) < 0)
|
|
|
8b9a1c |
return -1;
|
|
|
8b9a1c |
return ListAssSlice(self, start, step, slicelen,
|
|
|
8b9a1c |
--- 2616,2622 ----
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self),
|
|
|
8b9a1c |
&start, &stop, &step, &slicelen) < 0)
|
|
|
8b9a1c |
return -1;
|
|
|
8b9a1c |
return ListAssSlice(self, start, step, slicelen,
|
|
|
8b9a1c |
*** ../vim-7.4.152/src/if_python.c 2014-01-14 16:36:40.000000000 +0100
|
|
|
8b9a1c |
--- src/if_python.c 2014-01-14 18:56:41.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 343,349 ****
|
|
|
8b9a1c |
static PyInt(*dll_PyTuple_Size)(PyObject *);
|
|
|
8b9a1c |
static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt);
|
|
|
8b9a1c |
static PyTypeObject* dll_PyTuple_Type;
|
|
|
8b9a1c |
! static int (*dll_PySlice_GetIndicesEx)(PyObject *r, PyInt length,
|
|
|
8b9a1c |
PyInt *start, PyInt *stop, PyInt *step,
|
|
|
8b9a1c |
PyInt *slicelen);
|
|
|
8b9a1c |
static PyObject*(*dll_PyImport_ImportModule)(const char *);
|
|
|
8b9a1c |
--- 343,349 ----
|
|
|
8b9a1c |
static PyInt(*dll_PyTuple_Size)(PyObject *);
|
|
|
8b9a1c |
static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt);
|
|
|
8b9a1c |
static PyTypeObject* dll_PyTuple_Type;
|
|
|
8b9a1c |
! static int (*dll_PySlice_GetIndicesEx)(PySliceObject *r, PyInt length,
|
|
|
8b9a1c |
PyInt *start, PyInt *stop, PyInt *step,
|
|
|
8b9a1c |
PyInt *slicelen);
|
|
|
8b9a1c |
static PyObject*(*dll_PyImport_ImportModule)(const char *);
|
|
|
8b9a1c |
*** ../vim-7.4.152/src/if_python3.c 2014-01-14 16:36:40.000000000 +0100
|
|
|
8b9a1c |
--- src/if_python3.c 2014-01-14 18:58:19.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 294,300 ****
|
|
|
8b9a1c |
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
|
|
|
8b9a1c |
static int (*py3_PyMapping_Check)(PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyMapping_Keys)(PyObject *);
|
|
|
8b9a1c |
! static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
|
|
|
8b9a1c |
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
|
|
|
8b9a1c |
Py_ssize_t *slicelen);
|
|
|
8b9a1c |
static PyObject* (*py3_PyErr_NoMemory)(void);
|
|
|
8b9a1c |
--- 294,300 ----
|
|
|
8b9a1c |
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
|
|
|
8b9a1c |
static int (*py3_PyMapping_Check)(PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyMapping_Keys)(PyObject *);
|
|
|
8b9a1c |
! static int (*py3_PySlice_GetIndicesEx)(PySliceObject *r, Py_ssize_t length,
|
|
|
8b9a1c |
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
|
|
|
8b9a1c |
Py_ssize_t *slicelen);
|
|
|
8b9a1c |
static PyObject* (*py3_PyErr_NoMemory)(void);
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1190,1196 ****
|
|
|
8b9a1c |
if (CheckBuffer((BufferObject *) self))
|
|
|
8b9a1c |
return NULL;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PyObject *)idx,
|
|
|
8b9a1c |
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
--- 1190,1196 ----
|
|
|
8b9a1c |
if (CheckBuffer((BufferObject *) self))
|
|
|
8b9a1c |
return NULL;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
|
|
|
8b9a1c |
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1222,1228 ****
|
|
|
8b9a1c |
if (CheckBuffer((BufferObject *) self))
|
|
|
8b9a1c |
return -1;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PyObject *)idx,
|
|
|
8b9a1c |
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
--- 1222,1228 ----
|
|
|
8b9a1c |
if (CheckBuffer((BufferObject *) self))
|
|
|
8b9a1c |
return -1;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
|
|
|
8b9a1c |
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1306,1312 ****
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PyObject *)idx,
|
|
|
8b9a1c |
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
--- 1306,1312 ----
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
|
|
|
8b9a1c |
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1333,1339 ****
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PyObject *)idx,
|
|
|
8b9a1c |
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
--- 1333,1339 ----
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
Py_ssize_t start, stop, step, slicelen;
|
|
|
8b9a1c |
|
|
|
8b9a1c |
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
|
|
|
8b9a1c |
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
|
|
|
8b9a1c |
&start, &stop,
|
|
|
8b9a1c |
&step, &slicelen) < 0)
|
|
|
8b9a1c |
*** ../vim-7.4.152/src/version.c 2014-01-14 16:54:53.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2014-01-14 18:54:01.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 153,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
hundred-and-one symptoms of being an internet addict:
|
|
|
8b9a1c |
161. You get up before the sun rises to check your e-mail, and you
|
|
|
8b9a1c |
find yourself in the very same chair long after the sun has set.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|