From e9efd5b15292847fea6aeff4168fc255e0aba172 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 27 Sep 2014 20:32:22 +0000 Subject: [PATCH] [MSVCRT] - Move __CxxFrameHandler3 to msvcrtex. Windows 2003's dll does not export this, and their msvcrt.lib doesn't have it, but we need this to support modern compilers. svn path=/trunk/; revision=64357 --- reactos/dll/win32/msvcrt/msvcrt.spec | 3 --- reactos/lib/sdk/cpprt/i386/cpprt.s | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/msvcrt/msvcrt.spec b/reactos/dll/win32/msvcrt/msvcrt.spec index ab80f4284f6..b52febd970f 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.spec +++ b/reactos/dll/win32/msvcrt/msvcrt.spec @@ -891,6 +891,3 @@ @ cdecl wctomb(ptr long) @ varargs wprintf(wstr) @ varargs wscanf(wstr) - -# Functions not exported in native dll: -@ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler diff --git a/reactos/lib/sdk/cpprt/i386/cpprt.s b/reactos/lib/sdk/cpprt/i386/cpprt.s index 49d0309ccfc..9219edea235 100644 --- a/reactos/lib/sdk/cpprt/i386/cpprt.s +++ b/reactos/lib/sdk/cpprt/i386/cpprt.s @@ -13,4 +13,7 @@ DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@ ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z +; These are the same +DEFINE_ALIAS ___CxxFrameHandler3, ___CxxFrameHandler + END