From 70f9abe99f9c0027f2e85dbffaa7cdc88d9af7d7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 31 Aug 2018 19:20:03 +0200
Subject: [PATCH] Revert "Add conditionals to maintain backwards compatibility
 with OSX 10.5"

This reverts commit 1222192afb2438880f61b02d35be2c04c5af1a7e.
---
 ui/drivers/ui_cocoa.m | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index ec30ccd531..34d8bfc0bf 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -42,7 +42,6 @@
 #import <MetalKit/MetalKit.h>
 #endif
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
 @interface WindowListener : NSResponder<NSWindowDelegate>
 @end
 
@@ -60,7 +59,6 @@
 {}
 
 @end
-#endif
 
 id<ApplePlatform> apple_platform;
 
@@ -74,9 +72,7 @@ id<ApplePlatform> apple_platform;
    apple_view_type_t _vt;
    NSView* _renderView;
    id _sleepActivity;
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
    WindowListener *_listener;
-#endif
 }
 
 @property (nonatomic, retain) NSWindow IBOutlet* window;
@@ -268,15 +264,11 @@ static char** waiting_argv;
    }
 #endif
    
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
    _listener = [WindowListener new];
-#endif
    
    [self.window setAcceptsMouseMovedEvents: YES];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
    [self.window setNextResponder:_listener];
    self.window.delegate = _listener;
-#endif
    
    [[self.window contentView] setAutoresizesSubviews:YES];
 
@@ -294,10 +286,8 @@ static char** waiting_argv;
 
    waiting_argc = 0;
    
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
    [self.window makeMainWindow];
    [self.window makeKeyWindow];
-#endif
    
    [self performSelectorOnMainThread:@selector(rarch_main) withObject:nil waitUntilDone:NO];
 }
@@ -315,9 +305,7 @@ static char** waiting_argv;
       _renderView.wantsLayer = NO;
       _renderView.layer = nil;
       [_renderView removeFromSuperview];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
       self.window.contentView = nil;
-#endif
       _renderView = nil;
    }
    
@@ -348,13 +336,8 @@ static char** waiting_argv;
    _renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
    _renderView.frame = self.window.contentView.bounds;
    
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
    self.window.contentView = _renderView;
    [self.window.contentView setNextResponder:_listener];
-#else
-   [self.window.contentView addSubview:_renderView];
-   [self.window makeFirstResponder:_renderView];
-#endif
 }
 
 - (apple_view_type_t)viewType {