1
0
forked from aniani/vim

patch 8.1.1661: cannot build with +textprop but without +balloon_eval

Problem:    Cannot build with +textprop but without +balloon_eval.
Solution:   Adjust #ifdefs. (closes #4645)
This commit is contained in:
Bram Moolenaar
2019-07-10 22:21:48 +02:00
parent 7780e5c1c5
commit 247bf0de46
2 changed files with 8 additions and 5 deletions

View File

@@ -230,13 +230,14 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
# include "if_ruby.pro"
# endif
/* Ugly solution for "BalloonEval" not being defined while it's used in some
* .pro files. */
# ifdef FEAT_BEVAL
# include "beval.pro"
# else
// Ugly solution for "BalloonEval" not being defined while it's used in some
// .pro files.
# ifndef FEAT_BEVAL
# define BalloonEval int
# endif
# if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
# include "beval.pro"
# endif
# ifdef FEAT_NETBEANS_INTG
# include "netbeans.pro"

View File

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