From 363f4fa9c15b36a290a91624916579308b42db57 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 27 Aug 2023 22:22:10 +0300
Subject: [PATCH] avoid type redefinition errors after commit ee806597b9.
(Reference issue: https://github.com/libsdl-org/SDL/issues/8142)
---
src/video/android/SDL_androidvulkan.c | 2 ++
src/video/kmsdrm/SDL_kmsdrmvulkan.c | 2 ++
src/video/vivante/SDL_vivantevulkan.c | 2 ++
src/video/wayland/SDL_waylandvulkan.c | 2 ++
src/video/windows/SDL_windowsvideo.c | 3 +++
src/video/windows/SDL_windowsvulkan.c | 2 ++
src/video/windows/SDL_windowsvulkan.h | 4 ++--
src/video/x11/SDL_x11vulkan.c | 3 ++-
8 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/video/android/SDL_androidvulkan.c b/src/video/android/SDL_androidvulkan.c
index 685b7c4edd17..8a0af19629f1 100644
--- a/src/video/android/SDL_androidvulkan.c
+++ b/src/video/android/SDL_androidvulkan.c
@@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_ANDROID)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_androidvideo.h"
#include "SDL_androidwindow.h"
diff --git a/src/video/kmsdrm/SDL_kmsdrmvulkan.c b/src/video/kmsdrm/SDL_kmsdrmvulkan.c
index dac3ab329fb8..619053c9fc64 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvulkan.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvulkan.c
@@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_KMSDRM)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_kmsdrmvideo.h"
#include "SDL_kmsdrmdyn.h"
#include "SDL_kmsdrmvulkan.h"
diff --git a/src/video/vivante/SDL_vivantevulkan.c b/src/video/vivante/SDL_vivantevulkan.c
index a84d893da571..24d910700261 100644
--- a/src/video/vivante/SDL_vivantevulkan.c
+++ b/src/video/vivante/SDL_vivantevulkan.c
@@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_VIVANTE)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_vivantevideo.h"
#include "SDL_vivantevulkan.h"
diff --git a/src/video/wayland/SDL_waylandvulkan.c b/src/video/wayland/SDL_waylandvulkan.c
index eb430a29f821..1f667512a8cf 100644
--- a/src/video/wayland/SDL_waylandvulkan.c
+++ b/src/video/wayland/SDL_waylandvulkan.c
@@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WAYLAND)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_waylandvideo.h"
#include "SDL_waylandwindow.h"
diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
index 52bbb8e67e33..daa2bed5214a 100644
--- a/src/video/windows/SDL_windowsvideo.c
+++ b/src/video/windows/SDL_windowsvideo.c
@@ -22,6 +22,9 @@
#ifdef SDL_VIDEO_DRIVER_WINDOWS
+#ifdef SDL_VIDEO_VULKAN
+#include "../SDL_vulkan_internal.h"
+#endif
#include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h"
#include "../../SDL_hints_c.h"
diff --git a/src/video/windows/SDL_windowsvulkan.c b/src/video/windows/SDL_windowsvulkan.c
index 060e2ac01d15..f0b288b42145 100644
--- a/src/video/windows/SDL_windowsvulkan.c
+++ b/src/video/windows/SDL_windowsvulkan.c
@@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_windowsvideo.h"
#include "SDL_windowswindow.h"
diff --git a/src/video/windows/SDL_windowsvulkan.h b/src/video/windows/SDL_windowsvulkan.h
index 707e9d489287..17b69687ca52 100644
--- a/src/video/windows/SDL_windowsvulkan.h
+++ b/src/video/windows/SDL_windowsvulkan.h
@@ -29,11 +29,11 @@
#ifndef SDL_windowsvulkan_h_
#define SDL_windowsvulkan_h_
+#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
+
#include "../SDL_vulkan_internal.h"
#include "../SDL_sysvideo.h"
-#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
-
int WIN_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path);
void WIN_Vulkan_UnloadLibrary(SDL_VideoDevice *_this);
SDL_bool WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
diff --git a/src/video/x11/SDL_x11vulkan.c b/src/video/x11/SDL_x11vulkan.c
index 6ab1c5ada807..b81b980417ba 100644
--- a/src/video/x11/SDL_x11vulkan.c
+++ b/src/video/x11/SDL_x11vulkan.c
@@ -22,9 +22,10 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_X11)
+#include "../SDL_vulkan_internal.h"
+
#include "SDL_x11video.h"
-#include "../SDL_vulkan_internal.h"
#include "SDL_x11vulkan.h"
#include <X11/Xlib.h>