- Use __MINGW_NOTHROW instead of __attribute__

svn path=/trunk/; revision=43065

diff --git a/reactos/include/crt/float.h b/reactos/include/crt/float.h
index 13bde7b..25fa05d 100644 (file)
--- a/reactos/include/crt/float.h
+++ b/reactos/include/crt/float.h
@@ -104,12 +104,12 @@ extern "C" {
 /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask),
  * i.e. change the bits in unMask to have the values they have in unNew,
  * leaving other bits unchanged. */
-_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _controlfp (unsigned int unNew, unsigned int unMask);
-_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _control87 (unsigned int unNew, unsigned int unMask);
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask);
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask);
 
 
-_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _clearfp (void);    /* Clear the FPU status word */
-_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _statusfp (void);   /* Report the FPU status word */
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void);  /* Clear the FPU status word */
+_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */
 #define                _clear87        _clearfp
 #define                _status87       _statusfp
 
@@ -123,11 +123,11 @@ _CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _statusfp (void);      /*
    per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when
    building your application.
 */
-void __cdecl __attribute__ ((__nothrow__)) _fpreset (void);
-void __cdecl __attribute__ ((__nothrow__)) fpreset (void);
+void __cdecl __MINGW_NOTHROW _fpreset (void);
+void __cdecl __MINGW_NOTHROW fpreset (void);
 
 /* Global 'variable' for the current floating point error code. */
-_CRTIMP int * __cdecl __attribute__ ((__nothrow__)) __fpecode(void);
+_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void);
 #define        _fpecode        (*(__fpecode()))
 
 /*
@@ -135,15 +135,15 @@ _CRTIMP int * __cdecl __attribute__ ((__nothrow__)) __fpecode(void);
  * but they really belong in math.h.
  */
 
-_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _chgsign  (double);
-_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _copysign (double, double);
-_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _logb (double);
-_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _nextafter (double, double);
-_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _scalb (double, long);
+_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign        (double);
+_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double);
+_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double);
+_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double);
+_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long);
 
-_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _finite (double);
-_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _fpclass (double);
-_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _isnan (double);
+_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double);
+_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double);
+_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double);
 
 #ifdef __cplusplus
 }

diff --git a/reactos/include/crt/setjmp.h b/reactos/include/crt/setjmp.h
index 3f56a52..673b4b5 100644 (file)
--- a/reactos/include/crt/setjmp.h
+++ b/reactos/include/crt/setjmp.h
@@ -130,27 +130,27 @@ extern "C" {
 #define _JMP_BUF_DEFINED
 #endif
 
-  void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp(void);
+  void * __cdecl __MINGW_NOTHROW mingw_getsp(void);
 
 #ifdef USE_MINGW_SETJMP_TWO_ARGS
 #ifndef _INC_SETJMPEX
 #define setjmp(BUF) _setjmp((BUF),mingw_getsp())
-  int __cdecl __attribute__ ((__nothrow__)) _setjmp(jmp_buf _Buf,void *_Ctx);
+  int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx);
 #else
 #undef setjmp
 #define setjmp(BUF) _setjmpex((BUF),mingw_getsp())
 #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp())
-  int __cdecl __attribute__ ((__nothrow__)) _setjmpex(jmp_buf _Buf,void *_Ctx);
+  int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx);
 #endif
 #else
 #ifndef _INC_SETJMPEX
 #define setjmp _setjmp
 #endif
-  int __cdecl __attribute__ ((__nothrow__)) setjmp(jmp_buf _Buf);
+  int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf);
 #endif
 
-  __declspec(noreturn) __attribute__ ((__nothrow__)) void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/;
-  __declspec(noreturn) __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value);
+  __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);
 
 #ifdef __cplusplus
 }