From 8366cf8738e8b7bb74c967d07bf0fd2a1878e575 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Mon, 23 Jan 2023 23:38:34 +0200 Subject: tuklib_physmem: Clean up the way -Wcast-function-type is silenced on Windows. __has_warning and other __has_foo macros are meant to become compiler-agnostic so it's not good to check for __clang__ with it. This also relied on tuklib_common.h for #defining __has_warning which was confusing as #defining reserved macros is generally not a good idea. --- src/common/tuklib_physmem.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c index 73d37c29..14a66c03 100644 --- a/src/common/tuklib_physmem.c +++ b/src/common/tuklib_physmem.c @@ -73,6 +73,17 @@ #endif +// With GCC >= 8.1 with -Wextra and Clang >= 13 with -Wcast-function-type +// will warn about the Windows-specific code. +#if TUKLIB_GNUC_REQ(8,1) +# define CAN_DISABLE_WCAST_FUNCTION_TYPE 1 +#elif defined(__has_warning) +# if __has_warning("-Wcast-function-type") +# define CAN_DISABLE_WCAST_FUNCTION_TYPE 1 +# endif +#endif + + extern uint64_t tuklib_physmem(void) { @@ -87,15 +98,13 @@ tuklib_physmem(void) HMODULE kernel32 = GetModuleHandle(TEXT("kernel32.dll")); if (kernel32 != NULL) { typedef BOOL (WINAPI *gmse_type)(LPMEMORYSTATUSEX); -#if TUKLIB_GNUC_REQ(8,1) || (defined(__clang__) \ - && __has_warning("-Wcast-function-type")) +#ifdef CAN_DISABLE_WCAST_FUNCTION_TYPE # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wcast-function-type" #endif gmse_type gmse = (gmse_type)GetProcAddress( kernel32, "GlobalMemoryStatusEx"); -#if TUKLIB_GNUC_REQ(8,1) || (defined(__clang__) \ - && __has_warning("-Wcast-function-type")) +#ifdef CAN_DISABLE_WCAST_FUNCTION_TYPE # pragma GCC diagnostic pop #endif if (gmse != NULL) { -- cgit v1.2.3