Преглед изворни кода

Merge pull request #35193 from akien-mga/i-live-in-the-void

MinGW: Avoid GCC -Wcast-function-type warnings on GetProcAddress
Rémi Verschelde пре 5 година
родитељ
комит
6135037551

+ 5 - 0
platform/windows/context_gl_windows.cpp

@@ -43,6 +43,11 @@
 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
 #define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
 #define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
 
 
+#if defined(__GNUC__)
+// Workaround GCC warning from -Wcast-function-type.
+#define wglGetProcAddress (void *)wglGetProcAddress
+#endif
+
 typedef HGLRC(APIENTRY *PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int *);
 typedef HGLRC(APIENTRY *PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int *);
 
 
 void ContextGL_Windows::release_current() {
 void ContextGL_Windows::release_current() {

+ 5 - 0
platform/windows/joypad_windows.cpp

@@ -37,6 +37,11 @@
 #define __builtin_bswap32 _byteswap_ulong
 #define __builtin_bswap32 _byteswap_ulong
 #endif
 #endif
 
 
+#if defined(__GNUC__)
+// Workaround GCC warning from -Wcast-function-type.
+#define GetProcAddress (void *)GetProcAddress
+#endif
+
 DWORD WINAPI _xinput_get_state(DWORD dwUserIndex, XINPUT_STATE *pState) {
 DWORD WINAPI _xinput_get_state(DWORD dwUserIndex, XINPUT_STATE *pState) {
 	return ERROR_DEVICE_NOT_CONNECTED;
 	return ERROR_DEVICE_NOT_CONNECTED;
 }
 }

+ 5 - 0
platform/windows/os_windows.cpp

@@ -74,6 +74,11 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 #define WM_POINTERUPDATE 0x0245
 #define WM_POINTERUPDATE 0x0245
 #endif
 #endif
 
 
+#if defined(__GNUC__)
+// Workaround GCC warning from -Wcast-function-type.
+#define GetProcAddress (void *)GetProcAddress
+#endif
+
 typedef struct {
 typedef struct {
 	int count;
 	int count;
 	int screen;
 	int screen;