[ros-diffs] [tkreuzer] 49794: [CRT] simplify and fix definition of setjmp

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Thu Nov 25 22:35:58 UTC 2010


Author: tkreuzer
Date: Thu Nov 25 22:35:57 2010
New Revision: 49794

URL: http://svn.reactos.org/svn/reactos?rev=49794&view=rev
Log:
[CRT]
simplify and fix definition of setjmp

Modified:
    branches/cmake-bringup/include/crt/setjmp.h

Modified: branches/cmake-bringup/include/crt/setjmp.h
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjmp.h?rev=49794&r1=49793&r2=49794&view=diff
==============================================================================
--- branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] Thu Nov 25 22:35:57 2010
@@ -136,9 +136,6 @@
 #define _JMP_BUF_DEFINED
 #endif
 
-#ifdef _MSC_VER
-int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
-#else
 #ifdef USE_MINGW_SETJMP_TWO_ARGS
 #ifndef _INC_SETJMPEX
 #if defined(__x86_64)
@@ -150,19 +147,18 @@
 #endif
 #define setjmp(BUF) _setjmp((BUF),mingw_getsp())
   int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx);
-#else
+#else /* _INC_SETJMPEX */
 #undef setjmp
 #define setjmp(BUF) _setjmpex((BUF),mingw_getsp())
 #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp())
   int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx);
-#endif
-#else
+#endif /* _INC_SETJMPEX */
+#else /* !USE_MINGW_SETJMP_TWO_ARGS */
 #ifndef _INC_SETJMPEX
 #define setjmp _setjmp
 #endif
   int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
-#endif
-#endif
+#endif /* !USE_MINGW_SETJMP_TWO_ARGS */
 
   __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);




More information about the Ros-diffs mailing list