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

patch 7.4.2122

Browse Source 
Problem:    Mac: don't get +clipboard in huge build.
Solution:   Move #define down below including featureh.h
This commit is contained in:
Bram Moolenaar
2016-07-30 14:12:23 +02:00
parent 9532fe7fbe
commit b822cb0f93
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2122,
/**/ /**/
2121, 2121,
/**/ /**/

21
src/vim.h
View File

@@ -98,12 +98,6 @@
# ifndef HAVE_CONFIG_H # ifndef HAVE_CONFIG_H
# define UNIX # define UNIX
# endif # endif
# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD)
# define FEAT_CLIPBOARD
# endif
# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
# define FEAT_MOUSE
# endif
#endif #endif
#if defined(MACOS_X) || defined(MACOS_CLASSIC) #if defined(MACOS_X) || defined(MACOS_CLASSIC)
# define MACOS # define MACOS
@@ -180,7 +174,20 @@
#endif #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. */ /* +x11 is only enabled when it's both available and wanted. */
#if defined(HAVE_X11) && defined(WANT_X11) #if defined(HAVE_X11) && defined(WANT_X11)