|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.060
|
|
|
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.060
|
|
|
8b9a1c |
Problem: Declaration has wrong return type for PyObject_SetAttrString().
|
|
|
8b9a1c |
Solution: Use int instead of PyObject. (Andreas Schwab)
|
|
|
8b9a1c |
Files: src/if_python.c, src/if_python3.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.059/src/if_python.c 2013-07-09 21:40:11.000000000 +0200
|
|
|
8b9a1c |
--- src/if_python.c 2013-11-03 00:24:57.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 359,365 ****
|
|
|
8b9a1c |
static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
static int (*dll_PyObject_HasAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
! static PyObject* (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_CallFunctionObjArgs)(PyObject *, ...);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_CallFunction)(PyObject *, char *, ...);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_Call)(PyObject *, PyObject *, PyObject *);
|
|
|
8b9a1c |
--- 359,365 ----
|
|
|
8b9a1c |
static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
static int (*dll_PyObject_HasAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
! static int (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_CallFunctionObjArgs)(PyObject *, ...);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_CallFunction)(PyObject *, char *, ...);
|
|
|
8b9a1c |
static PyObject* (*dll_PyObject_Call)(PyObject *, PyObject *, PyObject *);
|
|
|
8b9a1c |
*** ../vim-7.4.059/src/if_python3.c 2013-07-09 21:53:21.000000000 +0200
|
|
|
8b9a1c |
--- src/if_python3.c 2013-11-03 00:24:57.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 302,308 ****
|
|
|
8b9a1c |
static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
static int (*py3_PyObject_HasAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
! static PyObject* (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...);
|
|
|
8b9a1c |
static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *);
|
|
|
8b9a1c |
--- 302,308 ----
|
|
|
8b9a1c |
static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
static int (*py3_PyObject_HasAttrString)(PyObject *, const char *);
|
|
|
8b9a1c |
! static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...);
|
|
|
8b9a1c |
static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...);
|
|
|
8b9a1c |
static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *);
|
|
|
8b9a1c |
*** ../vim-7.4.059/src/version.c 2013-11-03 00:20:46.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2013-11-03 00:26:19.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 60,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
Kisses may last for as much as, but no more than, five minutes.
|
|
|
8b9a1c |
[real standing law in Iowa, United States of America]
|
|
|
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 ///
|