Sync with trunk r43123

[reactos.git] / reactos / include / crt / setjmp.h

diff --git a/reactos/include/crt/setjmp.h b/reactos/include/crt/setjmp.h
index 673b4b5..3c27ff4 100644 (file)
--- a/reactos/include/crt/setjmp.h
+++ b/reactos/include/crt/setjmp.h
@@ -14,6 +14,10 @@
 extern "C" {
 #endif
 
+#ifndef _INC_SETJMPEX
+#define setjmp  _setjmp
+#endif
+
 #if (defined(_X86_) && !defined(__x86_64))
 
 #define _JBLEN 16
@@ -32,7 +36,9 @@ extern "C" {
     unsigned long UnwindFunc;
     unsigned long UnwindData[6];
   } _JUMP_BUFFER;
+
 #elif defined(__ia64__)
+
   typedef _CRT_ALIGN(16) struct _SETJMP_FLOAT128 {
     __int64 LowPart;
     __int64 HighPart;
@@ -92,7 +98,9 @@ extern "C" {
     __int64 Preds;
 
   } _JUMP_BUFFER;
+
 #elif defined(__x86_64)
+
   typedef _CRT_ALIGN(16) struct _SETJMP_FLOAT128 {
     unsigned __int64 Part[2];
   } SETJMP_FLOAT128;
@@ -124,12 +132,15 @@ extern "C" {
     SETJMP_FLOAT128 Xmm14;
     SETJMP_FLOAT128 Xmm15;
   } _JUMP_BUFFER;
+
 #endif
+
 #ifndef _JMP_BUF_DEFINED
   typedef _JBTYPE jmp_buf[_JBLEN];
 #define _JMP_BUF_DEFINED
 #endif
 
+#if 0
   void * __cdecl __MINGW_NOTHROW mingw_getsp(void);
 
 #ifdef USE_MINGW_SETJMP_TWO_ARGS
@@ -149,8 +160,11 @@ extern "C" {
   int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
 #endif
 
+#endif // 0
+
   __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);
+  int __cdecl setjmp(jmp_buf _Buf);
 
 #ifdef __cplusplus
 }