[Scummvm-git-logs] scummvm master -> 3cbd38b96bfad5c71dd53b29d5c6df4ba32a26ae

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3cbd38b96b BACKENDS: IMGUI: Fix Redundant Redeclaration GCC Compiler Warning


Commit: 3cbd38b96bfad5c71dd53b29d5c6df4ba32a26ae
    https://github.com/scummvm/scummvm/commit/3cbd38b96bfad5c71dd53b29d5c6df4ba32a26ae
Author: D G Turner (digitall at scummvm.org)
Date: 2024-10-12T22:40:23+01:00

Commit Message:
BACKENDS: IMGUI: Fix Redundant Redeclaration GCC Compiler Warning

Changed paths:
    backends/imgui/backends/imgui_impl_sdl2.cpp
    backends/imgui/scummvm.patch


diff --git a/backends/imgui/backends/imgui_impl_sdl2.cpp b/backends/imgui/backends/imgui_impl_sdl2.cpp
index e0c56d06c5c..ec9e0c944dc 100644
--- a/backends/imgui/backends/imgui_impl_sdl2.cpp
+++ b/backends/imgui/backends/imgui_impl_sdl2.cpp
@@ -128,7 +128,8 @@
 #define SDL_HAS_DISPLAY_EVENT               SDL_VERSION_ATLEAST(2,0,9)
 #define SDL_HAS_SHOW_WINDOW_ACTIVATION_HINT SDL_VERSION_ATLEAST(2,0,18)
 #if SDL_HAS_VULKAN
-extern "C" { extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window* window, int* w, int* h); }
+//extern "C" { extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window* window, int* w, int* h); }
+#include <SDL_vulkan.h>
 #elif
 static const Uint32 SDL_WINDOW_VULKAN = 0x10000000;
 #endif
diff --git a/backends/imgui/scummvm.patch b/backends/imgui/scummvm.patch
index ec9b546de8a..580da5a0eb9 100644
--- a/backends/imgui/scummvm.patch
+++ b/backends/imgui/scummvm.patch
@@ -92,6 +92,16 @@ diff --color -rbu ./backends/imgui_impl_sdl2.cpp ../scummvm/scummvm/backends/img
  
  // Clang warnings with -Weverything
  #if defined(__clang__)
+@@ -128,7 +128,8 @@
+ #define SDL_HAS_DISPLAY_EVENT               SDL_VERSION_ATLEAST(2,0,9)
+ #define SDL_HAS_SHOW_WINDOW_ACTIVATION_HINT SDL_VERSION_ATLEAST(2,0,18)
+ #if SDL_HAS_VULKAN
+-extern "C" { extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window* window, int* w, int* h); }
++//extern "C" { extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window* window, int* w, int* h); }
++#include <SDL_vulkan.h>
+ #elif
+ static const Uint32 SDL_WINDOW_VULKAN = 0x10000000;
+ #endif
 @@ -346,6 +348,11 @@
      return ImGui::FindViewportByPlatformHandle((void*)(intptr_t)window_id);
  }