Merged revisions 80182 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80182 | ronald.oussoren | 2010-04-18 17:02:38 +0200 (Sun, 18 Apr 2010) | 9 lines

  Merged revisions 80178 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines

    Fix for issue #7072
  ........
................
This commit is contained in:
Ronald Oussoren 2010-04-18 15:08:43 +00:00
parent 5ec05cdc69
commit 3a20d05dcc
3 changed files with 21 additions and 2 deletions

View file

@ -605,6 +605,16 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
#ifdef __FreeBSD__
#include <osreldate.h>
#if __FreeBSD_version > 500039
# define _PY_PORT_CTYPE_UTF8_ISSUE
#endif
#endif
#if defined(__APPLE__)
# define _PY_PORT_CTYPE_UTF8_ISSUE
#endif
#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
#include <ctype.h>
#include <wctype.h>
#undef isalnum
@ -622,7 +632,6 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
#undef toupper
#define toupper(c) towupper(btowc(c))
#endif
#endif
/* Declarations for symbol visibility.