From 37741a0cb5f63a0fd10c64dd6e61e6f6ccd00296 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Thu, 21 Jul 2011 12:28:23 +0200
Subject: [PATCH] Use correct availability macros

---
 src/MacVim/MMAppController.m    |  2 +-
 src/MacVim/MMVimController.m    | 12 ++++++------
 src/MacVim/MMWindowController.m |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index 19be338bd9..fc60f53911 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -241,7 +241,7 @@ - (id)init
 {
     if (!(self = [super init])) return nil;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
     // Disable automatic relaunching
     [NSApp disableRelaunchOnLogin];
 #endif
diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m
index 3db777d02d..7c0631b977 100644
--- a/src/MacVim/MMVimController.m
+++ b/src/MacVim/MMVimController.m
@@ -766,21 +766,21 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         [self setServerName:name];
         [name release];
     } else if (EnterFullscreenMsgID == msgid) {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
+        [[windowController window] toggleFullScreen:self];
+#else
         const void *bytes = [data bytes];
         int fuoptions = *((int*)bytes); bytes += sizeof(int);
         int bg = *((int*)bytes);
         NSColor *back = [NSColor colorWithArgbInt:bg];
 
         [windowController enterFullscreen:fuoptions backgroundColor:back];
-#else
-        [[windowController window] toggleFullScreen:self];
 #endif
     } else if (LeaveFullscreenMsgID == msgid) {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
-        [windowController leaveFullscreen];
-#else
+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
         [[windowController window] toggleFullScreen:self];
+#else
+        [windowController leaveFullscreen];
 #endif
     } else if (SetBuffersModifiedMsgID == msgid) {
         const void *bytes = [data bytes];
diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m
index 68b50aa420..85505279ff 100644
--- a/src/MacVim/MMWindowController.m
+++ b/src/MacVim/MMWindowController.m
@@ -181,7 +181,7 @@ - (id)initWithVimController:(MMVimController *)controller
     if ([win respondsToSelector:@selector(_setContentHasShadow:)])
         [win _setContentHasShadow:NO];
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
     [win setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 #endif