commit 3a20d05dcc518646172293ed44a76a3cd1c02d2b
author Ronald Oussoren <ronaldoussoren@mac.com> Sun Apr 18 15:08:43 2010 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> Sun Apr 18 15:08:43 2010 +0000
tree 059a74e787c8b11052a826022bf67f677cc6d9db
parent 5ec05cdc690a6d51b5657e34e3d2dee8b9a1ec18

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
  ........
................

Include/pyport.h

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 @@
 #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 @@
 #undef toupper
 #define toupper(c) towupper(btowc(c))
 #endif
-#endif
 
 
 /* Declarations for symbol visibility.