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

---
 src/video/SDL_video.c                | 2 +-
 src/video/cocoa/SDL_cocoametalview.h | 2 +-
 src/video/cocoa/SDL_cocoametalview.m | 2 +-
 src/video/cocoa/SDL_cocoavideo.m     | 2 +-
 src/video/uikit/SDL_uikitmetalview.m | 2 +-
 src/video/uikit/SDL_uikitvideo.m     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index d02509abdc..cb140b5b21 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -197,7 +197,7 @@ static Uint32 SDL_DefaultGraphicsBackends(SDL_VideoDevice *_this)
         return SDL_WINDOW_OPENGL;
     }
 #endif
-#if SDL_VIDEO_METAL && (TARGET_OS_MACCATALYST || __MACOS__ || defined(__IOS__))
+#if defined(SDL_VIDEO_METAL) && (TARGET_OS_MACCATALYST || __MACOS__ || defined(__IOS__))
     if (_this->Metal_CreateView != NULL) {
         return SDL_WINDOW_METAL;
     }
diff --git a/src/video/cocoa/SDL_cocoametalview.h b/src/video/cocoa/SDL_cocoametalview.h
index 2bf7e3976b..c45da1c82a 100644
--- a/src/video/cocoa/SDL_cocoametalview.h
+++ b/src/video/cocoa/SDL_cocoametalview.h
@@ -29,7 +29,7 @@
 #ifndef SDL_cocoametalview_h_
 #define SDL_cocoametalview_h_
 
-#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
+#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || defined(SDL_VIDEO_METAL))
 
 #import "../SDL_sysvideo.h"
 
diff --git a/src/video/cocoa/SDL_cocoametalview.m b/src/video/cocoa/SDL_cocoametalview.m
index 6c8ae0a8f9..10a002b041 100644
--- a/src/video/cocoa/SDL_cocoametalview.m
+++ b/src/video/cocoa/SDL_cocoametalview.m
@@ -28,7 +28,7 @@
 
 #import "SDL_cocoametalview.h"
 
-#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
+#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || defined(SDL_VIDEO_METAL))
 
 #include <SDL3/SDL_syswm.h>
 
diff --git a/src/video/cocoa/SDL_cocoavideo.m b/src/video/cocoa/SDL_cocoavideo.m
index e935e78a84..d6a23f65ba 100644
--- a/src/video/cocoa/SDL_cocoavideo.m
+++ b/src/video/cocoa/SDL_cocoavideo.m
@@ -161,7 +161,7 @@ static SDL_VideoDevice *Cocoa_CreateDevice(void)
         device->Vulkan_CreateSurface = Cocoa_Vulkan_CreateSurface;
 #endif
 
-#if SDL_VIDEO_METAL
+#ifdef SDL_VIDEO_METAL
         device->Metal_CreateView = Cocoa_Metal_CreateView;
         device->Metal_DestroyView = Cocoa_Metal_DestroyView;
         device->Metal_GetLayer = Cocoa_Metal_GetLayer;
diff --git a/src/video/uikit/SDL_uikitmetalview.m b/src/video/uikit/SDL_uikitmetalview.m
index 8dfc79877d..ed73030a1a 100644
--- a/src/video/uikit/SDL_uikitmetalview.m
+++ b/src/video/uikit/SDL_uikitmetalview.m
@@ -28,7 +28,7 @@
 
 #include "SDL_internal.h"
 
-#if defined(SDL_VIDEO_DRIVER_UIKIT) && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
+#if defined(SDL_VIDEO_DRIVER_UIKIT) && (SDL_VIDEO_VULKAN || defined(SDL_VIDEO_METAL))
 
 #include "../SDL_sysvideo.h"
 
diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m
index d47b5ba507..dfd42d87d2 100644
--- a/src/video/uikit/SDL_uikitvideo.m
+++ b/src/video/uikit/SDL_uikitvideo.m
@@ -126,7 +126,7 @@ static SDL_VideoDevice *UIKit_CreateDevice(void)
         device->Vulkan_CreateSurface = UIKit_Vulkan_CreateSurface;
 #endif
 
-#if SDL_VIDEO_METAL
+#ifdef SDL_VIDEO_METAL
         device->Metal_CreateView = UIKit_Metal_CreateView;
         device->Metal_DestroyView = UIKit_Metal_DestroyView;
         device->Metal_GetLayer = UIKit_Metal_GetLayer;