[Scummvm-git-logs] scummvm branch-2-9 -> 28edb54a56caefc5e894a8754463ad9836420ae1

[dwatteau]

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:
28edb54a56 BACKENDS: IMGUI: Fix '#elif with no expression' error with GCC


Commit: 28edb54a56caefc5e894a8754463ad9836420ae1
    https://github.com/scummvm/scummvm/commit/28edb54a56caefc5e894a8754463ad9836420ae1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-12-14T03:52:59+01:00

Commit Message:
BACKENDS: IMGUI: Fix '#elif with no expression' error with GCC

Fixed in current upstream code.

(cherry picked from commit 3d5cb9fa584e643a99b3e9b4fc2fe4f17f5e6c0a)

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 ec9e0c944dc..c4669b0769c 100644
--- a/backends/imgui/backends/imgui_impl_sdl2.cpp
+++ b/backends/imgui/backends/imgui_impl_sdl2.cpp
@@ -130,7 +130,7 @@
 #if SDL_HAS_VULKAN
 //extern "C" { extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window* window, int* w, int* h); }
 #include <SDL_vulkan.h>
-#elif
+#else
 static const Uint32 SDL_WINDOW_VULKAN = 0x10000000;
 #endif
 
diff --git a/backends/imgui/scummvm.patch b/backends/imgui/scummvm.patch
index 580da5a0eb9..937ff9e9553 100644
--- a/backends/imgui/scummvm.patch
+++ b/backends/imgui/scummvm.patch
@@ -99,7 +99,8 @@ diff --color -rbu ./backends/imgui_impl_sdl2.cpp ../scummvm/scummvm/backends/img
 -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
+-#elif
++#else
  static const Uint32 SDL_WINDOW_VULKAN = 0x10000000;
  #endif
 @@ -346,6 +348,11 @@