|
Line 0
Link Here
|
|
|
1 |
--- Include/pyport.h.orig 2014-10-08 10:18:11.000000000 +0200 |
| 2 |
+++ Include/pyport.h 2015-02-02 22:36:15.000000000 +0100 |
| 3 |
@@ -691,6 +691,12 @@ |
| 4 |
#endif |
| 5 |
|
| 6 |
#ifdef _PY_PORT_CTYPE_UTF8_ISSUE |
| 7 |
+#ifndef __cplusplus |
| 8 |
+ /* The workaround below is unsafe in C++ because |
| 9 |
+ * the <locale> defines these symbols as real functions, |
| 10 |
+ * with a slightly different signature. |
| 11 |
+ * See Mac Ports issue #10910 |
| 12 |
+ */ |
| 13 |
#include <ctype.h> |
| 14 |
#include <wctype.h> |
| 15 |
#undef isalnum |
| 16 |
@@ -708,6 +714,7 @@ |
| 17 |
#undef toupper |
| 18 |
#define toupper(c) towupper(btowc(c)) |
| 19 |
#endif |
| 20 |
+#endif |
| 21 |
|
| 22 |
|
| 23 |
/* Declarations for symbol visibility. |