From: Torge Matthies tmatthies@codeweavers.com
This reverts commit c31ac0d8c561c3ab83c4bd70183a453674c28616. --- dlls/concrt140/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcrt/cpp.c | 5 ----- 5 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/concrt140/Makefile.in b/dlls/concrt140/Makefile.in index 69f5d762290..05258adf7ee 100644 --- a/dlls/concrt140/Makefile.in +++ b/dlls/concrt140/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CONCRT= -DCRT_HAS_EXCEPTION_PTR=1 +EXTRADEFS = -D_CONCRT= MODULE = concrt140.dll PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index cfc780cc815..d17aa79b3d7 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= -DCRT_HAS_EXCEPTION_PTR=1 +EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 IMPORTS = ntdll diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 61e607d48c5..0bc15e27d94 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= -DCRT_HAS_EXCEPTION_PTR=1 +EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 IMPORTS = ntdll diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index c2bb09d4cc1..cc3d5b2bdff 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= -DCRT_HAS_EXCEPTION_PTR=1 +EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 IMPORTS = ntdll diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 30959dd0ef8..4c46b3d4e86 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -637,11 +637,6 @@ void throw_exception(const char* msg) __exception_ctor(&e, msg, &exception_vtable); _CxxThrowException(&e, &exception_exception_type); } -#elif defined(CRT_HAS_EXCEPTION_PTR) -#define STRINGIFY(x) #x -#define STRINGIFY2(x) STRINGIFY(x) -#pragma warning "_MSVCR_VER too low while CRT_HAS_EXCEPTION_PTR is set: " STRINGIFY2(_MSVCR_VER) -#error #endif
/******************************************************************