tuklib_physmem: Clean up disabled code

diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c
index 1009df14d9d15f3263593e2f908a2d4767667db2..91f2d196d157b76720bd6d27ec996c0dd6e698d3 100644 (file)
--- a/src/common/tuklib_physmem.c
+++ b/src/common/tuklib_physmem.c
@@ -91,18 +91,11 @@ tuklib_physmem(void)
                // supports reporting values greater than 4 GiB. To keep the
                // code working also on older Windows versions, use
                // GlobalMemoryStatusEx() conditionally.
-               HMODULE kernel32 = GetModuleHandle(TEXT("kernel32.dll"));
+               HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
                if (kernel32 != NULL) {
                        typedef BOOL (WINAPI *gmse_type)(LPMEMORYSTATUSEX);
-#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");
-#ifdef CAN_DISABLE_WCAST_FUNCTION_TYPE
-#      pragma GCC diagnostic pop
-#endif
                        if (gmse != NULL) {
                                MEMORYSTATUSEX meminfo;
                                meminfo.dwLength = sizeof(meminfo);