Add __MINGW_NOTHROW macro. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@536 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/_mingw.h b/mingw-w64-headers/include/_mingw.h index 7566438..14f8543 100644 --- a/mingw-w64-headers/include/_mingw.h +++ b/mingw-w64-headers/include/_mingw.h
@@ -120,6 +120,12 @@ #define __MINGW_ATTRIB_DEPRECATED #endif /* GNUC >= 3.1 */ +#if __MINGW_GNUC_PREREQ (3, 3) +#define __MINGW_NOTHROW __attribute__ ((__nothrow__)) +#else +#define __MINGW_NOTHROW +#endif + #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ # define __MSVCRT_VERSION__ 0x0700
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index 1b257b6..b4a67be 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -2737,6 +2737,8 @@ #define FLS_MAXIMUM_AVAILABLE 128 #define TLS_MINIMUM_AVAILABLE 64 +#ifdef _NT_TIB_DEFINED +#define _NT_TIB_DEFINED typedef struct _NT_TIB { struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; PVOID StackBase; @@ -2750,6 +2752,7 @@ struct _NT_TIB *Self; } NT_TIB; typedef NT_TIB *PNT_TIB; +#endif typedef struct _NT_TIB32 { DWORD ExceptionList;