From: Eric Branlund <ebranlund@fastmail.com>
Date: Wed, 26 Feb 2020 07:20:36 +0000 (-0800)
Subject: Since 10.6 is no longer of interest, removed the redeclarations that were used for it.
X-Git-Tag: vmacos2.2.1-7d~34
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3e54e9e21f183c1217606e1fe2a7f7ba79f2ffcc;hp=1e45f48f4ccbe342996486a7a5701f3656a49052;p=hengbandforosx%2Fhengbandosx.git

Since 10.6 is no longer of interest, removed the redeclarations that were used for it.
---

diff --git a/src/main-cocoa.m b/src/main-cocoa.m
index 451ae3f85..9cee326a3 100644
--- a/src/main-cocoa.m
+++ b/src/main-cocoa.m
@@ -68,17 +68,6 @@ enum
     AngbandEventWakeup = 1
 };
 
-/* Redeclare some 10.7 constants and methods so we can build on 10.6 */
-enum
-{
-    Angband_NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
-    Angband_NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
-};
-
-@interface NSWindow (AngbandLionRedeclares)
-- (void)setRestorable:(BOOL)flag;
-@end
-
 /* Delay handling of pre-emptive "quit" event */
 static BOOL quit_when_ready = FALSE;
 
@@ -2536,8 +2525,8 @@ static void Term_init_cocoa(term *t)
 	    NSWindowCollectionBehavior behavior = [window collectionBehavior];
 	    behavior |=
 		(termIdx == 0 ?
-		 Angband_NSWindowCollectionBehaviorFullScreenPrimary :
-		 Angband_NSWindowCollectionBehaviorFullScreenAuxiliary);
+		 NSWindowCollectionBehaviorFullScreenPrimary :
+		 NSWindowCollectionBehaviorFullScreenAuxiliary);
 	    [window setCollectionBehavior:behavior];
 	}