Kent Sibilev wrote:

> On Friday, July 29, 2016 at 3:01:36 PM UTC-4, Bram Moolenaar wrote:
> > Patch 7.4.2118
> > Problem:    Mac: can't build with tiny features.
> > Solution:   Don't define FEAT_CLIPBOARD unconditionally. (Kazunobu Kuriyama)
> > Files:      src/vim.h
> 
> After this patch the FEAT_CLIPBOARD is not enabled when building with huge 
> feature set. The issue is that this condition
> 
>  # if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) 
>  #  define FEAT_CLIPBOARD 
>  # endif 
> 
> is evaluated before the following #include
> 
> #include "feature.h"
> 
> which actually defines FEAT_SMALL.
> 
> It looks like that the following patch fixes it:
> 
> diff --git a/src/vim.h b/src/vim.h
> index b785527..157be28 100644
> --- a/src/vim.h
> +++ b/src/vim.h
> @@ -84,6 +84,8 @@
>  # define ROOT_UID 0
>  #endif
> 
> +#include "feature.h" /* #defines for optionals and features */
> +
>  /*
>   * MACOS_CLASSIC compiling for MacOS prior to MacOS X
>   * MACOS_X_UNIX  compiling for MacOS X (using os_unix.c)
> @@ -180,8 +182,6 @@
>  #endif
> 
> 
> -#include "feature.h"       /* #defines for optionals and features */
> -
>  /* +x11 is only enabled when it's both available and wanted. */
>  #if defined(HAVE_X11) && defined(WANT_X11)
>  # define FEAT_X11

Ah, so this never worked properly.

Moving feature.h has other problems.  I'll move the part that depends on
FEAT_SMALL down.

-- 
A parent can be arrested if his child cannot hold back a burp during a church
service.
                [real standing law in Nebraska, United States of America]

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui