diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-10 22:21:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-10 22:21:48 +0200 |
| commit | 247bf0de465411e4ebb1c0fe1a9e07f4a7f77e91 (patch) | |
| tree | eb0ce572898365212897ec562a1f0b69e40ee9f4 /src | |
| parent | 7780e5c1c5485a979ab6e3914a43e17912e213a8 (diff) | |
patch 8.1.1661: cannot build with +textprop but without +balloon_evalv8.1.1661
Problem: Cannot build with +textprop but without +balloon_eval.
Solution: Adjust #ifdefs. (closes #4645)
Diffstat (limited to 'src')
| -rw-r--r-- | src/proto.h | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/proto.h b/src/proto.h index 81023e2748..1c37bfa183 100644 --- a/src/proto.h +++ b/src/proto.h @@ -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" diff --git a/src/version.c b/src/version.c index 6af9abaaab..9e8fcbad01 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1661, +/**/ 1660, /**/ 1659, |