From b650e44ff2e2910bf58746ee7381f4cf292714ea Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 14 Nov 2008 16:57:19 +0000 Subject: [PATCH] Fix for building with /Zc:wchar_t-. [SVN r49757] --- src/usinstances.cpp | 2 +- src/wc_regex_traits.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usinstances.cpp b/src/usinstances.cpp index 3f9cc2f0..56653662 100644 --- a/src/usinstances.cpp +++ b/src/usinstances.cpp @@ -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 diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp index d8038d1b..3640f292 100644 --- a/src/wc_regex_traits.cpp +++ b/src/wc_regex_traits.cpp @@ -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