changeset 14911:73162bc0b21f v8.1.0467

patch 8.1.0467: cannot build with Mac OS X 10.5 commit https://github.com/vim/vim/commit/1d3dbcf743be9c72a0df5fc0711553fce287d3f8 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Oct 8 20:07:39 2018 +0200 patch 8.1.0467: cannot build with Mac OS X 10.5 Problem: Cannot build with Mac OS X 10.5. Solution: Change #ifdef into #if. (Akshay Hegde, closes https://github.com/vim/vim/issues/3022)
author Bram Moolenaar <Bram@vim.org>
date Mon, 08 Oct 2018 20:15:06 +0200
parents 69e45d17a823
children cf4333fc16bb
files src/os_macosx.m src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -63,7 +63,7 @@ clip_mch_request_selection(VimClipboard 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     NSPasteboard *pb = [NSPasteboard generalPasteboard];
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
     NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
 	    NSPasteboardTypeString, nil];
 #else
@@ -99,7 +99,7 @@ clip_mch_request_selection(VimClipboard 
     {
 	/* Use NSPasteboardTypeString.  The motion type is detected automatically.
 	 */
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 	NSMutableString *mstring =
 		[[pb stringForType:NSPasteboardTypeString] mutableCopy];
 #else
@@ -188,7 +188,7 @@ clip_mch_set_selection(VimClipboard *cbd
 
 	/* See clip_mch_request_selection() for info on pasteboard types. */
 	NSPasteboard *pb = [NSPasteboard generalPasteboard];
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 	NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
 		NSPasteboardTypeString, nil];
 #else
@@ -201,7 +201,7 @@ clip_mch_set_selection(VimClipboard *cbd
 	NSArray *plist = [NSArray arrayWithObjects:motion, string, nil];
 	[pb setPropertyList:plist forType:VimPboardType];
 
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 	[pb setString:string forType:NSPasteboardTypeString];
 #else
 	[pb setString:string forType:NSStringPboardType];
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    467,
+/**/
     466,
 /**/
     465,