patch_pyport.h.diff

--- Include/pyport.h.orig	2014-06-29 21:05:24.000000000 -0500
+++ Include/pyport.h	2014-07-11 13:36:52.000000000 -0500
@@ -713,6 +713,12 @@
 #endif
 
 #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
+#ifndef __cplusplus
+   /* The workaround below is unsafe in C++ because
+    * the <locale> defines these symbols as real functions,
+    * with a slightly different signature.
+    * See issue #10910
+    */
 #include <ctype.h>
 #include <wctype.h>
 #undef isalnum
@@ -730,6 +736,7 @@
 #undef toupper
 #define toupper(c) towupper(btowc(c))
 #endif
+#endif
 
 
 /* Declarations for symbol visibility.