SDL_vulkan.h: undefine VK_DEFINE_HANDLER and VK_DEFINE_NON_DISPATCHAB…

…LE_HANDLE Allows including vulkan.hpp in user code in C++ before SDL_vulkan.h w/o errors. Fixes: #11328 . (cherry picked from commit 149ecff)
libsdl-org · Oct 29, 2024 · 478dff3 · 478dff3
1 parent 5b0e838
commit 478dff3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/include/SDL_vulkan.h b/include/SDL_vulkan.h
@@ -52,6 +52,10 @@ extern "C" {
 VK_DEFINE_HANDLE(VkInstance)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
 
+/* Make sure to undef to avoid issues in case of later vulkan include */
+#undef VK_DEFINE_HANDLE
+#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
+
 #endif /* !NO_SDL_VULKAN_TYPEDEFS */
 
 typedef VkInstance SDL_vulkanInstance;