Mercurial > vim
diff src/proto.h @ 12716:351cf7c67bbe v8.0.1236
patch 8.0.1236: Mac features are confusing
commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 28 21:11:06 2017 +0200
patch 8.0.1236: Mac features are confusing
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Oct 2017 21:15:35 +0200 |
| parents | 7791a15353dc |
| children | 0ebade0c0ab2 |
line wrap: on
line diff
--- a/src/proto.h +++ b/src/proto.h @@ -213,7 +213,7 @@ void qsort(void *base, size_t elm_count, # endif # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) -# if defined(UNIX) || defined(MACOS) +# if defined(UNIX) || defined(MACOS_X) # include "pty.pro" # endif # endif @@ -286,7 +286,7 @@ extern char *vim_SelFile(Widget toplevel #ifdef MACOS_CONVERT # include "os_mac_conv.pro" #endif -#if defined(MACOS_X_UNIX) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI) +#if defined(MACOS_X_DARWIN) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI) /* functions in os_macosx.m */ void clip_mch_lose_selection(VimClipboard *cbd); int clip_mch_own_selection(VimClipboard *cbd);