Blame SOURCES/7.4.153

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