GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-15 16:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.3.1239

Browse Source 
Problem:    Can't build with Python and MSVC10.
Solution:   Move #if outside of macro. (Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2013-06-24 21:21:58 +02:00
parent d5e376eb3b
commit c1c3d68da9
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -36,6 +36,9 @@ src/Obj*/pathdef.c
gvimext.dll
gvimext.lib
# Mac OSX
src/xxd/xxd.dSYM
# All platforms
*.rej
*.orig

20
src/if_py_both.h
View File

@ -139,13 +139,15 @@ StringToChars(PyObject *obj, PyObject **todecref)
}
else
{
PyErr_FORMAT(PyExc_TypeError,
#if PY_MAJOR_VERSION < 3
N_("expected str() or unicode() instance, but got %s")
PyErr_FORMAT(PyExc_TypeError,
N_("expected str() or unicode() instance, but got %s"),
Py_TYPE_NAME(obj));
#else
N_("expected bytes() or str() instance, but got %s")
PyErr_FORMAT(PyExc_TypeError,
N_("expected bytes() or str() instance, but got %s"),
Py_TYPE_NAME(obj));
#endif
, Py_TYPE_NAME(obj));
return NULL;
}
@ -191,15 +193,17 @@ NumberToLong(PyObject *obj, long *result, int flags)
}
else
{
PyErr_FORMAT(PyExc_TypeError,
#if PY_MAJOR_VERSION < 3
PyErr_FORMAT(PyExc_TypeError,
N_("expected int(), long() or something supporting "
"coercing to long(), but got %s")
"coercing to long(), but got %s"),
Py_TYPE_NAME(obj));
#else
PyErr_FORMAT(PyExc_TypeError,
N_("expected int() or something supporting coercing to int(), "
"but got %s")
"but got %s"),
Py_TYPE_NAME(obj));
#endif
, Py_TYPE_NAME(obj));
return -1;
}

2
src/version.c
View File

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