From a2d3cbf84f7c94437da6df6e681495ac03b0218f Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 29 Oct 2018 03:17:44 +0000
Subject: Remove an extraneous #ifdef and correct the spelling of a #define
 constant.

---
 macosx/tkMacOSXPrivate.h | 2 --
 macosx/tkMacOSXWm.c      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 24108a6..197879f 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -348,10 +348,8 @@ VISIBILITY_HIDDEN
 @end
 
 @interface NSWindow(TKWm)
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400
 - (NSPoint) tkConvertPointToScreen:(NSPoint)point;
 - (NSPoint) tkConvertPointFromScreen:(NSPoint)point;
-#endif
 @end
 
 #pragma mark NSMenu & NSMenuItem Utilities
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 0e30d28..a3f2043 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6562,7 +6562,7 @@ TkMacOSXMakeFullscreen(
 
 	/*For 10.13 and later add a button for exiting Fullscreen.*/
 	if ([NSApp macMinorVersion] > 12) {
-#if __MAC_OSX_VERSION_MAX_ALLOWED > 1090
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
 	    exitFullScreen = [[[NSStatusBar systemStatusBar]
 				   statusItemWithLength:NSVariableStatusItemLength] retain];
 	    NSImage *exitIcon = [NSImage imageNamed:@"NSExitFullScreenTemplate"];
-- 
cgit v0.12