From 42e48542452cb4fb60ab02965f77fb6b323d7c16 Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi.sugawara@gmail.com>
Date: Sun, 19 Jul 2020 07:57:10 -1000
Subject: [PATCH] replaced confusing ifdef with a more concise #if
 TARGET_OS_OSX

---
 ui/drivers/cocoa/cocoa_common.h | 2 +-
 ui/drivers/cocoa/cocoa_common.m | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index 0f8af00a27..06187a7bf8 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -114,7 +114,7 @@ typedef struct
 } apple_frontend_settings_t;
 extern apple_frontend_settings_t apple_frontend_settings;
 
-#if !defined(HAVE_COCOATOUCH) && (defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL))
+#if TARGET_OS_OSX
 #include <AppKit/AppKit.h>
 
 @interface CocoaView : NSView
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 80dd933d90..f0310c6b42 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -55,7 +55,7 @@ void *glkitview_init(void);
 }
 #endif
 
-#if !defined(HAVE_COCOATOUCH) && (defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL))
+#if TARGET_OS_OSX
 - (void)scrollWheel:(NSEvent *)theEvent {
     cocoa_input_data_t *apple = (cocoa_input_data_t*)input_driver_get_data();
     (void)apple;
@@ -77,7 +77,7 @@ void *glkitview_init(void);
 {
    self = [super init];
 
-#if !defined(HAVE_COCOATOUCH) && (defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL))
+#if TARGET_OS_OSX
    [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 #endif
 
@@ -115,7 +115,7 @@ void *glkitview_init(void);
    return self;
 }
 
-#if !defined(HAVE_COCOATOUCH) && (defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL))
+#if TARGET_OS_OSX
 - (void)setFrame:(NSRect)frameRect
 {
    [super setFrame:frameRect];