To: vim_dev@googlegroups.com

Subject: Patch 7.3.583

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.583

Problem:    PyObject_NextNotImplemented is not defined before Python 2.7.

	    (Danek Duvall)

Solution:   Add #ifdefs.

Files:	    src/if_python.c

*** ../vim-7.3.582/src/if_python.c	2012-06-29 19:14:48.000000000 +0200

--- src/if_python.c	2012-06-30 12:59:38.000000000 +0200

***************

*** 214,220 ****

  # define Py_Finalize dll_Py_Finalize

  # define Py_IsInitialized dll_Py_IsInitialized

  # define _PyObject_New dll__PyObject_New

! # define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented)

  # define _Py_NoneStruct (*dll__Py_NoneStruct)

  # define PyObject_Init dll__PyObject_Init

  # define PyObject_GetIter dll_PyObject_GetIter

--- 214,222 ----

  # define Py_Finalize dll_Py_Finalize

  # define Py_IsInitialized dll_Py_IsInitialized

  # define _PyObject_New dll__PyObject_New

! # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000

! #  define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented)

! # endif

  # define _Py_NoneStruct (*dll__Py_NoneStruct)

  # define PyObject_Init dll__PyObject_Init

  # define PyObject_GetIter dll_PyObject_GetIter

***************

*** 310,316 ****

--- 312,320 ----

  static PyObject*(*dll__PyObject_New)(PyTypeObject *, PyObject *);

  static PyObject*(*dll__PyObject_Init)(PyObject *, PyTypeObject *);

  static PyObject* (*dll_PyObject_GetIter)(PyObject *);

+ # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000

  static iternextfunc dll__PyObject_NextNotImplemented;

+ # endif

  static PyObject* dll__Py_NoneStruct;

  # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000

  static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);

***************

*** 430,436 ****

--- 434,442 ----

      {"_PyObject_New", (PYTHON_PROC*)&dll__PyObject_New},

      {"PyObject_Init", (PYTHON_PROC*)&dll__PyObject_Init},

      {"PyObject_GetIter", (PYTHON_PROC*)&dll_PyObject_GetIter},

+ # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000

      {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&dll__PyObject_NextNotImplemented},

+ # endif

      {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct},

  # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000

      {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype},

*** ../vim-7.3.582/src/version.c	2012-06-29 23:57:50.000000000 +0200

--- src/version.c	2012-06-30 13:20:46.000000000 +0200

***************

*** 716,717 ****

--- 716,719 ----

  {   /* Add new patch number below this line */

+ /**/

+     583,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

90. Instead of calling you to dinner, your spouse sends e-mail.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///