Index: src/usinstances.cpp =================================================================== --- src/usinstances.cpp (revision 49696) +++ src/usinstances.cpp (working copy) @@ -22,7 +22,7 @@ #include #include -#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) \ +#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \ && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)) // // This is a horrible workaround, but without declaring these symbols extern we get Index: src/wc_regex_traits.cpp =================================================================== --- src/wc_regex_traits.cpp (revision 49696) +++ src/wc_regex_traits.cpp (working copy) @@ -23,7 +23,7 @@ #include #include -#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) \ +#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \ && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)) // // This is a horrible workaround, but without declaring these symbols extern we get