1
0
forked from aniani/vim

updated for version 7.3.711

Problem:    vim.current.buffer is not available. (lilydjwg)
Solution:   Use py3_PyUnicode_AsUTF8 instead of py3_PyUnicode_AsUTF8String.
            (Ken Takata)
This commit is contained in:
Bram Moolenaar
2012-10-23 05:17:37 +02:00
parent 12a753a5ca
commit 9c9cbf1351
2 changed files with 17 additions and 15 deletions

View File

@@ -176,7 +176,7 @@ static void init_structs(void);
# define PyImport_AppendInittab py3_PyImport_AppendInittab # define PyImport_AppendInittab py3_PyImport_AppendInittab
# if PY_VERSION_HEX >= 0x030300f0 # if PY_VERSION_HEX >= 0x030300f0
# undef _PyUnicode_AsString # undef _PyUnicode_AsString
# define _PyUnicode_AsString py3_PyUnicode_AsUTF8String # define _PyUnicode_AsString py3_PyUnicode_AsUTF8
# else # else
# define _PyUnicode_AsString py3__PyUnicode_AsString # define _PyUnicode_AsString py3__PyUnicode_AsString
# endif # endif
@@ -287,7 +287,7 @@ static PyObject* py3__Py_TrueStruct;
static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o); static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
# if PY_VERSION_HEX >= 0x030300f0 # if PY_VERSION_HEX >= 0x030300f0
static char* (*py3_PyUnicode_AsUTF8String)(PyObject *unicode); static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode);
# else # else
static char* (*py3__PyUnicode_AsString)(PyObject *unicode); static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
# endif # endif
@@ -407,7 +407,7 @@ static struct
{"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
{"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
# if PY_VERSION_HEX >= 0x030300f0 # if PY_VERSION_HEX >= 0x030300f0
{"PyUnicode_AsUTF8String", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8String}, {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8},
# else # else
{"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
# endif # endif

View File

@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
711,
/**/ /**/
710, 710,
/**/ /**/