commit 99b9538636e44f2400b45a4b9fa3d74ccb958922
author Victor Stinner <victor.stinner@haypocalc.com> Mon Jul 04 14:23:54 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Mon Jul 04 14:23:54 2011 +0200
tree e55a5c1779528ffdc849e153a9d479147c9aa800
parent 9122fdd8fae87190a47a94767b7f0157478306ef

Issue #9642: Uniformize the tests on the availability of the mbcs codec

Add a new HAVE_MBCS define.

Include/unicodeobject.h

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 6c492d1..44c1775 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -109,6 +109,10 @@
 # endif
 #endif
 
+#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
+#  define HAVE_MBCS
+#endif
+
 #ifdef HAVE_WCHAR_H
 /* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
 # ifdef _HAVE_BSDI
@@ -1162,7 +1166,7 @@
     );
 #endif
 
-#ifdef MS_WIN32
+#ifdef HAVE_MBCS
 
 /* --- MBCS codecs for Windows -------------------------------------------- */
 
@@ -1191,7 +1195,7 @@
     );
 #endif
 
-#endif /* MS_WIN32 */
+#endif /* HAVE_MBCS */
 
 /* --- Decimal Encoder ---------------------------------------------------- */