X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fwidechars.h;h=2578a92539925bd09a85e6095c6dc7bf049422a3;hp=87c828fc31ccea9260627e9da77c27179f6752ff;hb=3d46d7e9d3e210417f34acf3b469378558398d07;hpb=47d2fb4537d9ad5bb14f4810561a327930ca4280

diff --git a/test/widechars.h b/test/widechars.h
index 87c828fc..2578a925 100644
--- a/test/widechars.h
+++ b/test/widechars.h
@@ -34,7 +34,7 @@
 
 #if USE_WIDEC_SUPPORT
 
-#if defined(_WIN32)
+#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER)
 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */
@@ -46,7 +46,7 @@ extern int __MINGW_NOTHROW _nc_mbtowc(wchar_t *pwc, const char *s, size_t n);
 extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
 #define mblen(s,n) _nc_mblen(s, n)
 
-#endif /* _WIN32 */
+#endif /* _WIN32||_WIN64 */
 
 #if HAVE_MBTOWC && HAVE_MBLEN
 #define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))