Karsten Hopp 5f973b
To: vim_dev@googlegroups.com
Karsten Hopp 5f973b
Subject: Patch 7.3.309
Karsten Hopp 5f973b
Fcc: outbox
Karsten Hopp 5f973b
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5f973b
Mime-Version: 1.0
Karsten Hopp 5f973b
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5f973b
Content-Transfer-Encoding: 8bit
Karsten Hopp 5f973b
------------
Karsten Hopp 5f973b
Karsten Hopp 5f973b
Patch 7.3.309 (after 7.3.307)
Karsten Hopp 5f973b
Problem:    Warnings for pointer types.
Karsten Hopp 5f973b
Solution:   Change PySliceObject to PyObject.
Karsten Hopp 5f973b
Files:	    src/if_python3.c
Karsten Hopp 5f973b
Karsten Hopp 5f973b
Karsten Hopp 5f973b
*** ../vim-7.3.308/src/if_python3.c	2011-09-14 15:01:54.000000000 +0200
Karsten Hopp 5f973b
--- src/if_python3.c	2011-09-14 15:30:45.000000000 +0200
Karsten Hopp 5f973b
***************
Karsten Hopp 5f973b
*** 1030,1036 ****
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PySliceObject *)idx,
Karsten Hopp 5f973b
  	      (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
Karsten Hopp 5f973b
  	      &start, &stop,
Karsten Hopp 5f973b
  	      &step, &slicelen) < 0) {
Karsten Hopp 5f973b
--- 1030,1036 ----
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PyObject *)idx,
Karsten Hopp 5f973b
  	      (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
Karsten Hopp 5f973b
  	      &start, &stop,
Karsten Hopp 5f973b
  	      &step, &slicelen) < 0) {
Karsten Hopp 5f973b
***************
Karsten Hopp 5f973b
*** 1054,1060 ****
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PySliceObject *)idx,
Karsten Hopp 5f973b
  	      (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
Karsten Hopp 5f973b
  	      &start, &stop,
Karsten Hopp 5f973b
  	      &step, &slicelen) < 0) {
Karsten Hopp 5f973b
--- 1054,1060 ----
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PyObject *)idx,
Karsten Hopp 5f973b
  	      (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
Karsten Hopp 5f973b
  	      &start, &stop,
Karsten Hopp 5f973b
  	      &step, &slicelen) < 0) {
Karsten Hopp 5f973b
***************
Karsten Hopp 5f973b
*** 1142,1148 ****
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PySliceObject *)idx,
Karsten Hopp 5f973b
  		((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
Karsten Hopp 5f973b
  		&start, &stop,
Karsten Hopp 5f973b
  		&step, &slicelen) < 0) {
Karsten Hopp 5f973b
--- 1142,1148 ----
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PyObject *)idx,
Karsten Hopp 5f973b
  		((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
Karsten Hopp 5f973b
  		&start, &stop,
Karsten Hopp 5f973b
  		&step, &slicelen) < 0) {
Karsten Hopp 5f973b
***************
Karsten Hopp 5f973b
*** 1164,1170 ****
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PySliceObject *)idx,
Karsten Hopp 5f973b
  		((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
Karsten Hopp 5f973b
  		&start, &stop,
Karsten Hopp 5f973b
  		&step, &slicelen) < 0) {
Karsten Hopp 5f973b
--- 1164,1170 ----
Karsten Hopp 5f973b
      } else if (PySlice_Check(idx)) {
Karsten Hopp 5f973b
  	Py_ssize_t start, stop, step, slicelen;
Karsten Hopp 5f973b
  
Karsten Hopp 5f973b
! 	if (PySlice_GetIndicesEx((PyObject *)idx,
Karsten Hopp 5f973b
  		((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
Karsten Hopp 5f973b
  		&start, &stop,
Karsten Hopp 5f973b
  		&step, &slicelen) < 0) {
Karsten Hopp 5f973b
*** ../vim-7.3.308/src/version.c	2011-09-14 15:39:26.000000000 +0200
Karsten Hopp 5f973b
--- src/version.c	2011-09-14 15:40:17.000000000 +0200
Karsten Hopp 5f973b
***************
Karsten Hopp 5f973b
*** 711,712 ****
Karsten Hopp 5f973b
--- 711,714 ----
Karsten Hopp 5f973b
  {   /* Add new patch number below this line */
Karsten Hopp 5f973b
+ /**/
Karsten Hopp 5f973b
+     309,
Karsten Hopp 5f973b
  /**/
Karsten Hopp 5f973b
Karsten Hopp 5f973b
-- 
Karsten Hopp 5f973b
Never enter the boss's office unless it's absolutely necessary.  Every boss
Karsten Hopp 5f973b
saves one corner of the desk for useless assignments that are doled out like
Karsten Hopp 5f973b
Halloween candy to each visitor.
Karsten Hopp 5f973b
				(Scott Adams - The Dilbert principle)
Karsten Hopp 5f973b
Karsten Hopp 5f973b
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5f973b
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5f973b
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 5f973b
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///