Mercurial > vim
comparison src/feature.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 | 68d7bc045dbe |
children | 963cdeb42c41 |
comparison
equal
deleted
inserted
replaced
12715:279ec0abb4ac | 12716:351cf7c67bbe |
---|---|
59 * Use +big for older systems: Other MS-Windows and VMS. | 59 * Use +big for older systems: Other MS-Windows and VMS. |
60 * Otherwise use +normal | 60 * Otherwise use +normal |
61 */ | 61 */ |
62 #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ | 62 #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ |
63 && !defined(FEAT_BIG) && !defined(FEAT_HUGE) | 63 && !defined(FEAT_BIG) && !defined(FEAT_HUGE) |
64 # if defined(UNIX) || defined(WIN3264) || defined(MACOS) | 64 # if defined(UNIX) || defined(WIN3264) || defined(MACOS_X) |
65 # define FEAT_HUGE | 65 # define FEAT_HUGE |
66 # else | 66 # else |
67 # if defined(MSWIN) || defined(VMS) || defined(MACOS) || defined(AMIGA) | 67 # if defined(MSWIN) || defined(VMS) || defined(AMIGA) |
68 # define FEAT_BIG | 68 # define FEAT_BIG |
69 # else | 69 # else |
70 # define FEAT_NORMAL | 70 # define FEAT_NORMAL |
71 # endif | 71 # endif |
72 # endif | 72 # endif |
361 * +float Floating point variables. | 361 * +float Floating point variables. |
362 * +num64 64-bit Number. | 362 * +num64 64-bit Number. |
363 */ | 363 */ |
364 #ifdef FEAT_NORMAL | 364 #ifdef FEAT_NORMAL |
365 # define FEAT_EVAL | 365 # define FEAT_EVAL |
366 # if defined(HAVE_FLOAT_FUNCS) || defined(WIN3264) || defined(MACOS) | 366 # if defined(HAVE_FLOAT_FUNCS) || defined(WIN3264) || defined(MACOS_X) |
367 # define FEAT_FLOAT | 367 # define FEAT_FLOAT |
368 # endif | 368 # endif |
369 # if defined(HAVE_STDINT_H) || defined(WIN3264) || (VIM_SIZEOF_LONG >= 8) | 369 # if defined(HAVE_STDINT_H) || defined(WIN3264) || (VIM_SIZEOF_LONG >= 8) |
370 # define FEAT_NUM64 | 370 # define FEAT_NUM64 |
371 # endif | 371 # endif |
775 /* | 775 /* |
776 * On some systems, when we compile with the GUI, we always use it. On Mac | 776 * On some systems, when we compile with the GUI, we always use it. On Mac |
777 * there is no terminal version, and on Windows we can't figure out how to | 777 * there is no terminal version, and on Windows we can't figure out how to |
778 * fork one off with :gui. | 778 * fork one off with :gui. |
779 */ | 779 */ |
780 #if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX)) | 780 #if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_DARWIN)) |
781 # define ALWAYS_USE_GUI | 781 # define ALWAYS_USE_GUI |
782 #endif | 782 #endif |
783 | 783 |
784 /* | 784 /* |
785 * +dialog_gui Use GUI dialog. | 785 * +dialog_gui Use GUI dialog. |