Merge r50693 from cmake banch:
_CxxThrowException is stdcall, not cdecl.

svn path=/trunk/; revision=51707
This commit is contained in:
Timo Kreuzer 2011-05-13 19:37:49 +00:00
parent bfd63b8167
commit 1034d441f3
5 changed files with 5 additions and 5 deletions

View file

@ -99,7 +99,7 @@
# stub _CrtSetReportHook # stub _CrtSetReportHook
# stub _CrtSetReportHook2 # stub _CrtSetReportHook2
# stub _CrtSetReportMode # stub _CrtSetReportMode
@ cdecl _CxxThrowException(long long) @ stdcall _CxxThrowException(long long)
@ cdecl -i386 -norelay _EH_prolog() @ cdecl -i386 -norelay _EH_prolog()
@ cdecl _Getdays() @ cdecl _Getdays()
@ cdecl _Getmonths() @ cdecl _Getmonths()

View file

@ -453,7 +453,7 @@
@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt
@ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItan() msvcrt._CItan
@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl -arch=i386 _CItanh() msvcrt._CItanh
@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException
@ extern _HUGE msvcrt._HUGE @ extern _HUGE msvcrt._HUGE
@ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter
@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler @ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler

View file

@ -497,7 +497,7 @@
@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt
@ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItan() msvcrt._CItan
@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl -arch=i386 _CItanh() msvcrt._CItanh
@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException
@ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog
@ extern _HUGE msvcrt._HUGE @ extern _HUGE msvcrt._HUGE
@ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter

View file

@ -490,7 +490,7 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
/********************************************************************* /*********************************************************************
* _CxxThrowException (MSVCRT.@) * _CxxThrowException (MSVCRT.@)
*/ */
void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type )
{ {
ULONG_PTR args[3]; ULONG_PTR args[3];

View file

@ -150,7 +150,7 @@ typedef struct __cxx_exception_type
const cxx_type_info_table *type_info_table; /* list of types for this exception object */ const cxx_type_info_table *type_info_table; /* list of types for this exception object */
} cxx_exception_type; } cxx_exception_type;
void CDECL _CxxThrowException(exception*,const cxx_exception_type*); void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);
int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS);
int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS);