diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-30 14:12:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-30 14:12:23 +0200 |
| commit | b822cb0f93177bb045b221f607aee735f08ce428 (patch) | |
| tree | b5bacb0e4b748dc9ee93c74cda21ebb9bac1ab78 | |
| parent | 9532fe7fbe1b14531931e83bd9f8054efdcf7509 (diff) | |
| download | vim-git-b822cb0f93177bb045b221f607aee735f08ce428.tar.gz | |
patch 7.4.2122v7.4.2122
Problem: Mac: don't get +clipboard in huge build.
Solution: Move #define down below including featureh.h
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 21 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/version.c b/src/version.c index 4af1468a7..65ec6b636 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2122, +/**/ 2121, /**/ 2120, @@ -98,12 +98,6 @@ # ifndef HAVE_CONFIG_H # define UNIX # endif -# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) -# define FEAT_CLIPBOARD -# endif -# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) -# define FEAT_MOUSE -# endif #endif #if defined(MACOS_X) || defined(MACOS_CLASSIC) # define MACOS @@ -180,7 +174,20 @@ #endif -#include "feature.h" /* #defines for optionals and features */ +/* + * #defines for optionals and features + * Also defines FEAT_TINY, FEAT_SMALL, etc. when FEAT_HUGE is defined. + */ +#include "feature.h" + +#if defined(MACOS_X_UNIX) +# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) +# define FEAT_CLIPBOARD +# endif +# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) +# define FEAT_MOUSE +# endif +#endif /* +x11 is only enabled when it's both available and wanted. */ #if defined(HAVE_X11) && defined(WANT_X11) |