summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-04-18 15:08:43 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-04-18 15:08:43 (GMT)
commit3a20d05dcc518646172293ed44a76a3cd1c02d2b (patch)
tree059a74e787c8b11052a826022bf67f677cc6d9db /Include
parent5ec05cdc690a6d51b5657e34e3d2dee8b9a1ec18 (diff)
downloadcpython-3a20d05dcc518646172293ed44a76a3cd1c02d2b.zip
cpython-3a20d05dcc518646172293ed44a76a3cd1c02d2b.tar.gz
cpython-3a20d05dcc518646172293ed44a76a3cd1c02d2b.tar.bz2
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 ........ ................
Diffstat (limited to 'Include')
-rw-r--r--Include/pyport.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index be15fe1..01b0c3a 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -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.