Module: wine Branch: master Commit: 307e5e8f6af46e8bc5b53e696848ba2d275ab3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307e5e8f6af46e8bc5b53e6968... Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 12 10:08:00 2017 -0700 msvcp90: Update exception RTTI data to reflect it's part of std namespace. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d323ded..0812ba9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -206,7 +206,7 @@ const char* __thiscall MSVCP_exception_what(exception * this) return this->name ? this->name : "Unknown exception"; } -#ifdef _MSVCIRT +#if _MSVCP_VER >= 80 DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@") #else DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@@") @@ -409,7 +409,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) #endif } -#ifdef _MSVCIRT +#if _MSVCP_VER >= 80 DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@") #else DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@@")