From 1d3dbcf743be9c72a0df5fc0711553fce287d3f8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 8 Oct 2018 20:07:39 +0200 Subject: [PATCH] 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 #3022) --- src/os_macosx.m | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/os_macosx.m b/src/os_macosx.m index 752bdae11..50ca361fb 100644 --- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -63,7 +63,7 @@ clip_mch_request_selection(VimClipboard *cbd) 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 *cbd) { /* 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]; diff --git a/src/version.c b/src/version.c index c416032f5..def449a57 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 467, /**/ 466, /**/ -- 2.50.1