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

---
 src/render/SDL_d3dmath.c              | 2 +-
 src/render/SDL_d3dmath.h              | 2 +-
 src/render/SDL_render.c               | 2 +-
 src/render/direct3d/SDL_render_d3d.c  | 6 +++---
 src/render/direct3d/SDL_shaders_d3d.c | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/render/SDL_d3dmath.c b/src/render/SDL_d3dmath.c
index 25b36976ab..45ed827781 100644
--- a/src/render/SDL_d3dmath.c
+++ b/src/render/SDL_d3dmath.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if (SDL_VIDEO_RENDER_D3D || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
+#if (defined(SDL_VIDEO_RENDER_D3D) || 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 2db5fdb4af..0c6ca4719d 100644
--- a/src/render/SDL_d3dmath.h
+++ b/src/render/SDL_d3dmath.h
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if (SDL_VIDEO_RENDER_D3D || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED
+#if (defined(SDL_VIDEO_RENDER_D3D) || 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 d297dad782..500cdf49fd 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -95,7 +95,7 @@ static const SDL_RenderDriver *render_drivers[] = {
 #if SDL_VIDEO_RENDER_D3D11
     &D3D11_RenderDriver,
 #endif
-#if SDL_VIDEO_RENDER_D3D
+#ifdef SDL_VIDEO_RENDER_D3D
     &D3D_RenderDriver,
 #endif
 #if SDL_VIDEO_RENDER_METAL
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index d81a971cab..42d83adf32 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D) && !SDL_RENDER_DISABLED
 
 #include "../../core/windows/SDL_windows.h"
 
@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_syswm.h>
 
-#if SDL_VIDEO_RENDER_D3D
+#ifdef SDL_VIDEO_RENDER_D3D
 #define D3D_DEBUG_INFO
 #include <d3d9.h>
 #endif
@@ -1735,7 +1735,7 @@ SDL_GetRenderD3D9Device(SDL_Renderer *renderer)
 {
     IDirect3DDevice9 *device = NULL;
 
-#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D) && !SDL_RENDER_DISABLED
     D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
 
     /* Make sure that this is a D3D renderer */
diff --git a/src/render/direct3d/SDL_shaders_d3d.c b/src/render/direct3d/SDL_shaders_d3d.c
index f40db5a9d2..f1197fd874 100644
--- a/src/render/direct3d/SDL_shaders_d3d.c
+++ b/src/render/direct3d/SDL_shaders_d3d.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
+#if defined(SDL_VIDEO_RENDER_D3D) && !SDL_RENDER_DISABLED
 
 #include "../../core/windows/SDL_windows.h"