summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-10 13:24:20 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-10 13:24:20 +0100
commite7427f4b7e1af6a63600183be6b4c5724beb2f66 (patch)
tree49015b7e639b94b79255f140cb4de5bec5ba5de0
parentde59ba33aa3b94f2757dbf3451682d762c15ebcf (diff)
downloadvim-git-e7427f4b7e1af6a63600183be6b4c5724beb2f66.tar.gz
patch 7.4.910v7.4.910
Problem: Compiler complains about type punned pointer. Solution: Use another way to increment the ref count.
-rw-r--r--src/if_py_both.h10
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index e2f4857e4..1ad7dc616 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -476,16 +476,18 @@ AlwaysNone(PyObject *self UNUSED)
AlwaysFalse(PyObject *self UNUSED)
{
/* do nothing */
- Py_INCREF(Py_False);
- return Py_False;
+ PyObject *ret = Py_False;
+ Py_INCREF(ret);
+ return ret;
}
static PyObject *
AlwaysTrue(PyObject *self UNUSED)
{
/* do nothing */
- Py_INCREF(Py_True);
- return Py_True;
+ PyObject *ret = Py_True;
+ Py_INCREF(ret);
+ return ret;
}
/***************/
diff --git a/src/version.c b/src/version.c
index 73713feac..e8b664fa6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 910,
+/**/
909,
/**/
908,