summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-03 00:28:25 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-03 00:28:25 +0100
commit0b400087d076ba1a476d753c019fbfd96d8ae58e (patch)
tree0cc81dc7cdb88fdb263cefb6b1bad70c2138d41c
parent9db1293317abd1aca101bf2d35caef0354f66e8b (diff)
downloadvim-git-0b400087d076ba1a476d753c019fbfd96d8ae58e.tar.gz
updated for version 7.4.060v7.4.060
Problem: Declaration has wrong return type for PyObject_SetAttrString(). Solution: Use int instead of PyObject. (Andreas Schwab)
-rw-r--r--src/if_python.c2
-rw-r--r--src/if_python3.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/if_python.c b/src/if_python.c
index 6e43b5dc3..e34bd280f 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -359,7 +359,7 @@ static int(*dll_PyRun_SimpleString)(char *);
static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
static int (*dll_PyObject_HasAttrString)(PyObject *, const char *);
-static PyObject* (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
+static int (*dll_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
static PyObject* (*dll_PyObject_CallFunctionObjArgs)(PyObject *, ...);
static PyObject* (*dll_PyObject_CallFunction)(PyObject *, char *, ...);
static PyObject* (*dll_PyObject_Call)(PyObject *, PyObject *, PyObject *);
diff --git a/src/if_python3.c b/src/if_python3.c
index 8a5b3329e..40bc97bc8 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -302,7 +302,7 @@ static int (*py3_PyRun_SimpleString)(char *);
static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *);
static int (*py3_PyObject_HasAttrString)(PyObject *, const char *);
-static PyObject* (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
+static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *);
static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...);
static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...);
static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *);
diff --git a/src/version.c b/src/version.c
index 2d90185b7..0c5c5734e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 60,
+/**/
59,
/**/
58,