aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.1158

Browse Source 
Problem:    Crash when running test 86. (Jun Takimoto)
Solution:   Define PY_SSIZE_T_CLEAN early. (Elimar Riesebieter)
This commit is contained in:
Bram Moolenaar
2013-06-10 18:36:24 +02:00
parent bcf4d178ab
commit 0bdda37fb4
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/if_python.c
View File

@@ -53,7 +53,14 @@
# undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */ # undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */
#endif #endif
#define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
# undef PY_SSIZE_T_CLEAN
#endif
#if defined(MACOS) && !defined(MACOS_X_UNIX) #if defined(MACOS) && !defined(MACOS_X_UNIX)
# include "macglue.h" # include "macglue.h"
# include <CodeFragments.h> # include <CodeFragments.h>
@@ -61,10 +68,6 @@
#undef main /* Defined in python.h - aargh */ #undef main /* Defined in python.h - aargh */
#undef HAVE_FCNTL_H /* Clash with os_win32.h */ #undef HAVE_FCNTL_H /* Clash with os_win32.h */
#if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
# define PY_SSIZE_T_CLEAN
#endif
#define PyBytes_FromString PyString_FromString #define PyBytes_FromString PyString_FromString
#define PyBytes_Check PyString_Check #define PyBytes_Check PyString_Check

7
src/if_python3.c
View File

@@ -61,7 +61,10 @@
# undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */ # undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */
#endif #endif
#define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#if defined(MACOS) && !defined(MACOS_X_UNIX) #if defined(MACOS) && !defined(MACOS_X_UNIX)
# include "macglue.h" # include "macglue.h"
# include <CodeFragments.h> # include <CodeFragments.h>
@@ -69,10 +72,6 @@
#undef main /* Defined in python.h - aargh */ #undef main /* Defined in python.h - aargh */
#undef HAVE_FCNTL_H /* Clash with os_win32.h */ #undef HAVE_FCNTL_H /* Clash with os_win32.h */
#if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
# define PY_SSIZE_T_CLEAN
#endif
/* The "surrogateescape" error handler is new in Python 3.1 */ /* The "surrogateescape" error handler is new in Python 3.1 */
#if PY_VERSION_HEX >= 0x030100f0 #if PY_VERSION_HEX >= 0x030100f0
# define CODEC_ERROR_HANDLER "surrogateescape" # define CODEC_ERROR_HANDLER "surrogateescape"

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
1158,
/**/ /**/
1157, 1157,
/**/ /**/