summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-24 20:32:57 +0200
committerBram Moolenaar <bram@vim.org>2013-06-24 20:32:57 +0200
commited4636387a37bfcb9adc6bcb2b71ee95f0386328 (patch)
tree9b464811c6696eda63504ad1305853d7a029cf92
parent372f2fee08e95427f03a7082cfcf9595425bcfb4 (diff)
downloadvim-ed4636387a37bfcb9adc6bcb2b71ee95f0386328.tar.gz
updated for version 7.3.1238v7.3.1238v7-3-1238
Problem: Crash in Python interface on 64 bit machines. Solution: Change argument type of PyString_AsStringAndSize. (Taro Muraoka, Jun Takimoto)
-rw-r--r--src/if_python.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/if_python.c b/src/if_python.c
index d72dbfcb..5245485e 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -329,7 +329,7 @@ static PyTypeObject* dll_PyInt_Type;
static PyTypeObject* dll_PyLong_Type;
static PyObject*(*dll_PyList_GetItem)(PyObject *, PyInt);
static int(*dll_PyList_Append)(PyObject *, PyObject *);
-static int(*dll_PyList_Insert)(PyObject *, int, PyObject *);
+static int(*dll_PyList_Insert)(PyObject *, PyInt, PyObject *);
static PyObject*(*dll_PyList_New)(PyInt size);
static int(*dll_PyList_SetItem)(PyObject *, PyInt, PyObject *);
static PyInt(*dll_PyList_Size)(PyObject *);
@@ -365,7 +365,7 @@ static PyObject* (*dll_PyObject_CallFunction)(PyObject *, char *, ...);
static PyObject* (*dll_PyObject_Call)(PyObject *, PyObject *, PyObject *);
static PyObject* (*dll_PyObject_Repr)(PyObject *);
static char*(*dll_PyString_AsString)(PyObject *);
-static int(*dll_PyString_AsStringAndSize)(PyObject *, char **, int *);
+static int(*dll_PyString_AsStringAndSize)(PyObject *, char **, PyInt *);
static PyObject*(*dll_PyString_FromString)(const char *);
static PyObject*(*dll_PyString_FromFormat)(const char *, ...);
static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
diff --git a/src/version.c b/src/version.c
index 59d4aa0a..95414725 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1238,
+/**/
1237,
/**/
1236,