diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
| commit | d057301b1f28736f094affa17b190244ad56e8d9 (patch) | |
| tree | ae20801354321a5ff0d7d23b04d8d6018c57645a /src/evalfunc.c | |
| parent | ef83956e1e67736b4c6b886d897b74f022622a74 (diff) | |
| download | vim-git-d057301b1f28736f094affa17b190244ad56e8d9.tar.gz | |
patch 8.0.1236: Mac features are confusingv8.0.1236
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 55d22951a..2f294ca1f 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -24,7 +24,7 @@ # include <float.h> #endif -#ifdef MACOS +#ifdef MACOS_X # include <time.h> /* for time_t */ #endif @@ -5539,14 +5539,13 @@ f_has(typval_T *argvars, typval_T *rettv) #ifdef __BEOS__ "beos", #endif -#ifdef MACOS - "mac", -#endif -#if defined(MACOS_X_UNIX) - "macunix", /* built with 'darwin' enabled */ -#endif -#if defined(__APPLE__) && __APPLE__ == 1 - "osx", /* built with or without 'darwin' enabled */ +#ifdef MACOS_X + "mac", /* Mac OS X (and, once, Mac OS Classic) */ + "osx", /* Mac OS X */ +# ifdef MACOS_X_DARWIN + "macunix", /* Mac OS X, with the darwin feature */ + "osxdarwin", /* synonym for macunix */ +# endif #endif #ifdef __QNX__ "qnx", |