thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1236: Mac features are confusing

Browse Source 
Problem:    Mac features are confusing.
Solution:   Make feature names more consistent, add "osxdarwin". Rename
            feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
This commit is contained in:
Bram Moolenaar
2017-10-28 21:11:06 +02:00
parent ef83956e1e
commit d057301b1f
38 changed files with 268 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/evalfunc.c
View File

@@ -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",