diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-10 17:01:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 17:01:47 +0100 |
| commit | a265d9b772e4f4fde00c3613b5ba80fe06a2f7e9 (patch) | |
| tree | f7f451f54eed2735131aca1c2d5e0027eeb63128 /platform/windows | |
| parent | e8870ddefc36f6e04dc6212ab5ca1d6391739539 (diff) | |
| parent | b727061ce0256c079e6c4fa217aed53d58d4573c (diff) | |
Merge pull request #54834 from akien-mga/windows-gcc-warnings-fix
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 5 | ||||
| -rw-r--r-- | platform/windows/gl_manager_windows.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index e2c9951692..aa97386399 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -42,6 +42,11 @@ #include "drivers/gles3/rasterizer_gles3.h" #endif +#if defined(__GNUC__) +// Workaround GCC warning from -Wcast-function-type. +#define GetProcAddress (void *)GetProcAddress +#endif + static String format_error_message(DWORD id) { LPWSTR messageBuffer = nullptr; size_t size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, diff --git a/platform/windows/gl_manager_windows.cpp b/platform/windows/gl_manager_windows.cpp index 98205d6282..1ce8b0b040 100644 --- a/platform/windows/gl_manager_windows.cpp +++ b/platform/windows/gl_manager_windows.cpp @@ -197,9 +197,6 @@ Error GLManager_Windows::window_create(DisplayServer::WindowID p_window_id, HWND return FAILED; } - // the display could be invalid .. check NYI - GLDisplay &gl_display = _displays[win.gldisplay_id]; - // make current window_make_current(_windows.size() - 1); |