From 06034b258aa873e4adeffed18f3da613975f7ce3 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 10 May 2025 11:05:36 +0300 Subject: [PATCH] [XDK] Some GCC/wine compatibility fixes --- sdk/include/xdk/ntbasedef.h | 4 ++++ sdk/include/xdk/winnt_old.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index a662f2bdfb2..c0f10eeca16 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -173,7 +173,11 @@ #endif #endif /* DECLSPEC_EXPORT */ +#ifdef __GNUC__ +#define DECLSPEC_NORETURN __attribute__((noreturn)) +#else #define DECLSPEC_NORETURN __declspec(noreturn) +#endif #ifndef DECLSPEC_ADDRSAFE #if defined(_MSC_VER) && (defined(_M_ALPHA) || defined(_M_AXP64)) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 569e9e10fc1..f2f3368925b 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -79,9 +79,9 @@ /*#ifdef _WINE*/ #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -# define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +# define __WINE_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) #else -# define __WINE_ALLOC_SIZE(x) +# define __WINE_ALLOC_SIZE(...) #endif /*#endif*/