From d848c95748fd6e09c6cf88ce85b50985dc789ccd Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Thu, 20 Jul 2023 15:51:04 -0500 Subject: [PATCH] Fix gcc builds failing on windows --- platform/windows/display_server_windows.cpp | 4 ++-- platform/windows/gl_manager_windows.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 73e0ec65116e..7e92f70f2a68 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -2409,8 +2409,8 @@ void DisplayServerWindows::set_icon(const Ref &p_icon) { SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_BIG, (LPARAM)hicon); } else { icon = Ref(); - SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_SMALL, NULL); - SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_BIG, NULL); + SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_SMALL, 0); + SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_BIG, 0); } } diff --git a/platform/windows/gl_manager_windows.cpp b/platform/windows/gl_manager_windows.cpp index 0334bdd973b4..d3972c7bbc98 100644 --- a/platform/windows/gl_manager_windows.cpp +++ b/platform/windows/gl_manager_windows.cpp @@ -53,6 +53,7 @@ #if defined(__GNUC__) // Workaround GCC warning from -Wcast-function-type. #define wglGetProcAddress (void *)wglGetProcAddress +#define GetProcAddress (void *)GetProcAddress #endif typedef HGLRC(APIENTRY *PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int *);