simplify and fix definition of setjmp

svn path=/branches/cmake-bringup/; revision=49794
This commit is contained in:
Timo Kreuzer 2010-11-25 22:35:57 +00:00
parent 93f5d28abf
commit 5a54b0b454

View file

@ -136,9 +136,6 @@ extern "C" {
#define _JMP_BUF_DEFINED #define _JMP_BUF_DEFINED
#endif #endif
#ifdef _MSC_VER
int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
#else
#ifdef USE_MINGW_SETJMP_TWO_ARGS #ifdef USE_MINGW_SETJMP_TWO_ARGS
#ifndef _INC_SETJMPEX #ifndef _INC_SETJMPEX
#if defined(__x86_64) #if defined(__x86_64)
@ -150,19 +147,18 @@ int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
#endif #endif
#define setjmp(BUF) _setjmp((BUF),mingw_getsp()) #define setjmp(BUF) _setjmp((BUF),mingw_getsp())
int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx);
#else #else /* _INC_SETJMPEX */
#undef setjmp #undef setjmp
#define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmp(BUF) _setjmpex((BUF),mingw_getsp())
#define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp())
int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx);
#endif #endif /* _INC_SETJMPEX */
#else #else /* !USE_MINGW_SETJMP_TWO_ARGS */
#ifndef _INC_SETJMPEX #ifndef _INC_SETJMPEX
#define setjmp _setjmp #define setjmp _setjmp
#endif #endif
int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
#endif #endif /* !USE_MINGW_SETJMP_TWO_ARGS */
#endif
__declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/;
__declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value); __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value);