Mercurial > vim

comparison src/evalfunc.c @ 12716:351cf7c67bbe v8.0.1236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 183dc24cf861
children 7749260f261c
comparison
equal deleted inserted replaced
12715:279ec0abb4ac 12716:351cf7c67bbe
22 22
23 #ifdef VMS 23 #ifdef VMS
24 # include <float.h> 24 # include <float.h>
25 #endif 25 #endif
26 26
27 #ifdef MACOS 27 #ifdef MACOS_X
28 # include <time.h> /* for time_t */ 28 # include <time.h> /* for time_t */
29 #endif 29 #endif
30 30
31 static char *e_listarg = N_("E686: Argument of %s must be a List"); 31 static char *e_listarg = N_("E686: Argument of %s must be a List");
32 #ifdef FEAT_QUICKFIX 32 #ifdef FEAT_QUICKFIX
5537 # endif 5537 # endif
5538 #endif 5538 #endif
5539 #ifdef __BEOS__ 5539 #ifdef __BEOS__
5540 "beos", 5540 "beos",
5541 #endif 5541 #endif
5542 #ifdef MACOS 5542 #ifdef MACOS_X
5543 "mac", 5543 "mac", /* Mac OS X (and, once, Mac OS Classic) */
5544 #endif 5544 "osx", /* Mac OS X */
5545 #if defined(MACOS_X_UNIX) 5545 # ifdef MACOS_X_DARWIN
5546 "macunix", /* built with 'darwin' enabled */ 5546 "macunix", /* Mac OS X, with the darwin feature */
5547 #endif 5547 "osxdarwin", /* synonym for macunix */
5548 #if defined(__APPLE__) && __APPLE__ == 1 5548 # endif
5549 "osx", /* built with or without 'darwin' enabled */
5550 #endif 5549 #endif
5551 #ifdef __QNX__ 5550 #ifdef __QNX__
5552 "qnx", 5551 "qnx",
5553 #endif 5552 #endif
5554 #ifdef UNIX 5553 #ifdef UNIX