From 0abbeec74164005d35b5a29259fbfa16ba5e3038 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <anonymous.maarten@gmail.com>
Date: Mon, 27 Mar 2023 15:53:40 +0200
Subject: [PATCH] Fix -Wundef warnings due to use of unguarded
 SDL_VIDEO_RENDER_D3D11

---
 src/core/winrt/SDL_winrtapp_direct3d.cpp   | 4 ++--
 src/render/SDL_d3dmath.c                   | 2 +-
 src/render/SDL_d3dmath.h                   | 2 +-
 src/render/SDL_render.c                    | 2 +-
 src/render/direct3d11/SDL_render_d3d11.c   | 4 ++--
 src/render/direct3d11/SDL_render_winrt.cpp | 2 +-
 src/render/direct3d11/SDL_render_winrt.h   | 2 +-
 src/render/direct3d11/SDL_shaders_d3d11.c  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/winrt/SDL_winrtapp_direct3d.cpp b/src/core/winrt/SDL_winrtapp_direct3d.cpp
index 3b3231da15..2a6c5c52c9 100644
--- a/src/core/winrt/SDL_winrtapp_direct3d.cpp
+++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp
@@ -59,7 +59,7 @@ extern "C" {
 #include "SDL_winrtapp_common.h"
 #include "SDL_winrtapp_direct3d.h"
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
 /* Calling IDXGIDevice3::Trim on the active Direct3D 11.x device is necessary
  * when Windows 8.1 apps are about to get suspended.
  */
@@ -618,7 +618,7 @@ void SDL_WinRTApp::OnSuspending(Platform::Object ^ sender, SuspendingEventArgs ^
         // Let the Direct3D 11 renderer prepare for the app to be backgrounded.
         // This is necessary for Windows 8.1, possibly elsewhere in the future.
         // More details at: http://msdn.microsoft.com/en-us/library/windows/apps/Hh994929.aspx
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
         if (WINRT_GlobalSDLWindow) {
             SDL_Renderer *renderer = SDL_GetRenderer(WINRT_GlobalSDLWindow);
             if (renderer && (SDL_strcmp(renderer->info.name, "direct3d11") == 0)) {
diff --git a/src/render/SDL_d3dmath.c b/src/render/SDL_d3dmath.c
index 45ed827781..373055ec71 100644
--- a/src/render/SDL_d3dmath.c
+++ b/src/render/SDL_d3dmath.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if (defined(SDL_VIDEO_RENDER_D3D) || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
+#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
 
 #include "SDL_d3dmath.h"
 
diff --git a/src/render/SDL_d3dmath.h b/src/render/SDL_d3dmath.h
index 0c6ca4719d..d51744acb6 100644
--- a/src/render/SDL_d3dmath.h
+++ b/src/render/SDL_d3dmath.h
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if (defined(SDL_VIDEO_RENDER_D3D) || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
+#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 500cdf49fd..815e0f0f06 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -92,7 +92,7 @@ static const SDL_RenderDriver *render_drivers[] = {
 #if SDL_VIDEO_RENDER_D3D12
     &D3D12_RenderDriver,
 #endif
-#if SDL_VIDEO_RENDER_D3D11
+#ifdef SDL_VIDEO_RENDER_D3D11
     &D3D11_RenderDriver,
 #endif
 #ifdef SDL_VIDEO_RENDER_D3D
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 85fc010a6e..aae710c872 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
 
 #define COBJMACROS
 #include "../../core/windows/SDL_windows.h"
@@ -2407,7 +2407,7 @@ SDL_GetRenderD3D11Device(SDL_Renderer *renderer)
 {
     ID3D11Device *device = NULL;
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
     D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
 
     /* Make sure that this is a D3D renderer */
diff --git a/src/render/direct3d11/SDL_render_winrt.cpp b/src/render/direct3d11/SDL_render_winrt.cpp
index 4d38c471cf..110f75a94e 100644
--- a/src/render/direct3d11/SDL_render_winrt.cpp
+++ b/src/render/direct3d11/SDL_render_winrt.cpp
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
 
 #include "../../video/winrt/SDL_winrtvideo_cpp.h"
 extern "C" {
diff --git a/src/render/direct3d11/SDL_render_winrt.h b/src/render/direct3d11/SDL_render_winrt.h
index 2cbfac1b3c..52dc5590ce 100644
--- a/src/render/direct3d11/SDL_render_winrt.h
+++ b/src/render/direct3d11/SDL_render_winrt.h
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/render/direct3d11/SDL_shaders_d3d11.c b/src/render/direct3d11/SDL_shaders_d3d11.c
index 14a535d86a..7585e2c398 100644
--- a/src/render/direct3d11/SDL_shaders_d3d11.c
+++ b/src/render/direct3d11/SDL_shaders_d3d11.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D11) && !SDL_RENDER_DISABLED
 
 #define COBJMACROS
 #include "../../core/windows/SDL_windows.h"