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

---
 src/video/SDL_egl.c                     | 2 +-
 src/video/SDL_video.c                   | 2 +-
 src/video/vivante/SDL_vivanteopengles.c | 2 +-
 src/video/vivante/SDL_vivanteopengles.h | 2 +-
 src/video/vivante/SDL_vivanteplatform.c | 2 +-
 src/video/vivante/SDL_vivanteplatform.h | 2 +-
 src/video/vivante/SDL_vivantevideo.c    | 2 +-
 src/video/vivante/SDL_vivantevulkan.c   | 2 +-
 src/video/vivante/SDL_vivantevulkan.h   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index 40a147c8bf..9202d83e71 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -67,7 +67,7 @@
 #define DEFAULT_OGL_ES_PVR (vc4 ? "libGLES_CM.so.1" : "libbrcmGLESv2.so")
 #define DEFAULT_OGL_ES     (vc4 ? "libGLESv1_CM.so.1" : "libbrcmGLESv2.so")
 
-#elif defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_VIVANTE
+#elif defined(SDL_VIDEO_DRIVER_ANDROID) || defined(SDL_VIDEO_DRIVER_VIVANTE)
 /* Android */
 #define DEFAULT_EGL        "libEGL.so"
 #define DEFAULT_OGL_ES2    "libGLESv2.so"
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 052af12359..1371e16773 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -73,7 +73,7 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_X11
     &X11_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_VIVANTE
+#ifdef SDL_VIDEO_DRIVER_VIVANTE
     &VIVANTE_bootstrap,
 #endif
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
diff --git a/src/video/vivante/SDL_vivanteopengles.c b/src/video/vivante/SDL_vivanteopengles.c
index 1908311161..20bc373b1b 100644
--- a/src/video/vivante/SDL_vivanteopengles.c
+++ b/src/video/vivante/SDL_vivanteopengles.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL
+#if defined(SDL_VIDEO_DRIVER_VIVANTE) && SDL_VIDEO_OPENGL_EGL
 
 #include "SDL_vivanteopengles.h"
 #include "SDL_vivantevideo.h"
diff --git a/src/video/vivante/SDL_vivanteopengles.h b/src/video/vivante/SDL_vivanteopengles.h
index 3cb5004f74..c321a2681b 100644
--- a/src/video/vivante/SDL_vivanteopengles.h
+++ b/src/video/vivante/SDL_vivanteopengles.h
@@ -23,7 +23,7 @@
 #ifndef SDL_vivanteopengles_h_
 #define SDL_vivanteopengles_h_
 
-#if SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL
+#if defined(SDL_VIDEO_DRIVER_VIVANTE) && SDL_VIDEO_OPENGL_EGL
 
 #include "../SDL_sysvideo.h"
 #include "../SDL_egl_c.h"
diff --git a/src/video/vivante/SDL_vivanteplatform.c b/src/video/vivante/SDL_vivanteplatform.c
index f0480f93d3..b671167664 100644
--- a/src/video/vivante/SDL_vivanteplatform.c
+++ b/src/video/vivante/SDL_vivanteplatform.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_VIVANTE
+#ifdef SDL_VIDEO_DRIVER_VIVANTE
 
 #include "SDL_vivanteplatform.h"
 
diff --git a/src/video/vivante/SDL_vivanteplatform.h b/src/video/vivante/SDL_vivanteplatform.h
index f6106a92ac..172169af4e 100644
--- a/src/video/vivante/SDL_vivanteplatform.h
+++ b/src/video/vivante/SDL_vivanteplatform.h
@@ -23,7 +23,7 @@
 #ifndef SDL_vivanteplatform_h_
 #define SDL_vivanteplatform_h_
 
-#if SDL_VIDEO_DRIVER_VIVANTE
+#ifdef SDL_VIDEO_DRIVER_VIVANTE
 
 #include "SDL_vivantevideo.h"
 
diff --git a/src/video/vivante/SDL_vivantevideo.c b/src/video/vivante/SDL_vivantevideo.c
index 41da76ebfa..8cf06defa4 100644
--- a/src/video/vivante/SDL_vivantevideo.c
+++ b/src/video/vivante/SDL_vivantevideo.c
@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#if SDL_VIDEO_DRIVER_VIVANTE
+#ifdef SDL_VIDEO_DRIVER_VIVANTE
 
 /* SDL internals */
 #include "../SDL_sysvideo.h"
diff --git a/src/video/vivante/SDL_vivantevulkan.c b/src/video/vivante/SDL_vivantevulkan.c
index 6379fc7b1a..a901d2d6da 100644
--- a/src/video/vivante/SDL_vivantevulkan.c
+++ b/src/video/vivante/SDL_vivantevulkan.c
@@ -26,7 +26,7 @@
  * the FSL demo framework.
  */
 
-#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_VIVANTE
+#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_VIVANTE)
 
 #include "SDL_vivantevideo.h"
 
diff --git a/src/video/vivante/SDL_vivantevulkan.h b/src/video/vivante/SDL_vivantevulkan.h
index bc85033bff..47e2948270 100644
--- a/src/video/vivante/SDL_vivantevulkan.h
+++ b/src/video/vivante/SDL_vivantevulkan.h
@@ -31,7 +31,7 @@
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
 
-#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_VIVANTE
+#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_VIVANTE)
 
 int VIVANTE_Vulkan_LoadLibrary(_THIS, const char *path);
 void VIVANTE_Vulkan_UnloadLibrary(_THIS);