From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Nov 2013 23:28:25 +0000 (+0100)
Subject: updated for version 7.4.060
X-Git-Tag: v7.4.060
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b400087d076ba1a476d753c019fbfd96d8ae58e;p=vim

updated for version 7.4.060
Problem:    Declaration has wrong return type for PyObject_SetAttrString().
Solution:   Use int instead of PyObject. (Andreas Schwab)
---

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
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    60,
 /**/
     59,
 /**/