dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MinGW: Avoid function cast warnings with GetProcAddress

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-09 01:08:28 +00:00
parent 49228a5ee4
commit 2b8018f5d6
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/windows/win32.cpp
View File

@@ -40,10 +40,6 @@
#include "../../safeguards.h"
#ifdef __MINGW32__
#pragma GCC diagnostic ignored "-Wcast-function-type"
#endif /* __MINGW32__ */
static bool _has_console;
static bool _cursor_disable = true;
static bool _cursor_visible = true;
@@ -71,13 +67,13 @@ bool LoadLibraryList(Function proc[], const char *dll)
if (lib == nullptr) return false;
for (;;) {
FARPROC p;
Function p;
while (*dll++ != '\0') { /* Nothing */ }
if (*dll == '\0') break;
p = GetProcAddress(lib, dll);
p = GetProcAddressT<Function>(lib, dll);
if (p == nullptr) return false;
*proc++ = (Function)p;
*proc++ = p;
}
dll++;
}
@@ -693,7 +689,7 @@ int OTTDStringCompare(const char *s1, const char *s2)
#endif
if (first_time) {
_CompareStringEx = (PFNCOMPARESTRINGEX)GetProcAddress(GetModuleHandle(L"Kernel32"), "CompareStringEx");
_CompareStringEx = GetProcAddressT<PFNCOMPARESTRINGEX>(GetModuleHandle(L"Kernel32"), "CompareStringEx");
first_time = false;
}