Forráskód Böngészése

avoid type redefinition errors after commit ee806597b9.

(Reference issue: https://github.com/libsdl-org/SDL/issues/8142)
Ozkan Sezer 1 éve
szülő
commit
363f4fa9c1

+ 2 - 0
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"
 

+ 2 - 0
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"

+ 2 - 0
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"

+ 2 - 0
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"
 

+ 3 - 0
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"

+ 2 - 0
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"
 

+ 2 - 2
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,

+ 2 - 1
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>