aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.1.0467: cannot build with Mac OS X 10.5

Browse Source 
Problem:    Cannot build with Mac OS X 10.5.
Solution:   Change #ifdef into #if. (Akshay Hegde, closes #3022)
This commit is contained in:
Bram Moolenaar
2018-10-08 20:07:39 +02:00
parent 6a2633b00b
commit 1d3dbcf743
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os_macosx.m
View File

@@ -63,7 +63,7 @@ clip_mch_request_selection(VimClipboard *cbd)
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSPasteboard *pb = [NSPasteboard generalPasteboard]; 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, NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
NSPasteboardTypeString, nil]; NSPasteboardTypeString, nil];
#else #else
@@ -99,7 +99,7 @@ clip_mch_request_selection(VimClipboard *cbd)
{ {
/* Use NSPasteboardTypeString. The motion type is detected automatically. /* 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 = NSMutableString *mstring =
[[pb stringForType:NSPasteboardTypeString] mutableCopy]; [[pb stringForType:NSPasteboardTypeString] mutableCopy];
#else #else
@@ -188,7 +188,7 @@ clip_mch_set_selection(VimClipboard *cbd)
/* See clip_mch_request_selection() for info on pasteboard types. */ /* See clip_mch_request_selection() for info on pasteboard types. */
NSPasteboard *pb = [NSPasteboard generalPasteboard]; 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, NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
NSPasteboardTypeString, nil]; NSPasteboardTypeString, nil];
#else #else
@@ -201,7 +201,7 @@ clip_mch_set_selection(VimClipboard *cbd)
NSArray *plist = [NSArray arrayWithObjects:motion, string, nil]; NSArray *plist = [NSArray arrayWithObjects:motion, string, nil];
[pb setPropertyList:plist forType:VimPboardType]; [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]; [pb setString:string forType:NSPasteboardTypeString];
#else #else
[pb setString:string forType:NSStringPboardType]; [pb setString:string forType:NSStringPboardType];

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
467,
/**/ /**/
466, 466,
/**/ /**/