diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2020-08-14 23:04:13 +0100 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2020-08-14 23:04:13 +0100 |
commit | afd09586d7ead4f146ad7a7a471be34196b3c6bc (patch) | |
tree | 87854be29fb4264b979b700fa45445f58faa4c26 /win32/include/_mingw.h | |
parent | e2ccf3981d78dfeb390d22c74625b60310100abb (diff) |
New upstream version 0.9.27+git20200814.62c30a4a
Diffstat (limited to 'win32/include/_mingw.h')
-rw-r--r-- | win32/include/_mingw.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h index 2fc9798..4ac2651 100644 --- a/win32/include/_mingw.h +++ b/win32/include/_mingw.h @@ -41,7 +41,7 @@ #define __MSVCRT__ 1 #undef _MSVCRT_ #define __MINGW_IMPORT extern __declspec(dllimport) -#define __MINGW_ATTRIB_NORETURN +#define __MINGW_ATTRIB_NORETURN __declspec(noreturn) #define __MINGW_ATTRIB_CONST #define __MINGW_ATTRIB_DEPRECATED #define __MINGW_ATTRIB_MALLOC @@ -51,7 +51,7 @@ #define __GNUC_VA_LIST #define _CRTIMP extern -#define __CRT_INLINE extern __inline__ +#define __CRT_INLINE static __inline__ #define _CRT_ALIGN(x) __attribute__((aligned(x))) #define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) @@ -76,18 +76,12 @@ #define _M_AMD64 100 /* Visual Studio */ #define USE_MINGW_SETJMP_TWO_ARGS #define mingw_getsp tinyc_getbp -#define __TRY__ #else #define __stdcall __attribute__((__stdcall__)) #define _X86_ 1 #define _M_IX86 300 /* Visual Studio */ #define WIN32 1 #define _USE_32BIT_TIME_T -#ifdef __arm__ -#define __TRY__ -#else -#define __TRY__ void __try__(void**), *_sehrec[6]; __try__(_sehrec); -#endif #endif /* in stddef.h */ @@ -138,7 +132,7 @@ typedef struct localeinfo_struct _locale_tstruct,*_locale_t; /* for winapi */ #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT -#define DECLSPEC_NORETURN +#define DECLSPEC_NORETURN __declspec(noreturn) #define DECLARE_STDCALL_P(type) __stdcall type #define NOSERVICE 1 #define NOMCX 1 |