Skip to content

Commit 247bf0d

Browse files
committed
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)
1 parent 7780e5c commit 247bf0d

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/proto.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,14 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
230230
# include "if_ruby.pro"
231231
# endif
232232

233-
/* Ugly solution for "BalloonEval" not being defined while it's used in some
234-
* .pro files. */
235-
# ifdef FEAT_BEVAL
236-
# include "beval.pro"
237-
# else
233+
// Ugly solution for "BalloonEval" not being defined while it's used in some
234+
// .pro files.
235+
# ifndef FEAT_BEVAL
238236
# define BalloonEval int
239237
# endif
238+
# if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
239+
# include "beval.pro"
240+
# endif
240241

241242
# ifdef FEAT_NETBEANS_INTG
242243
# include "netbeans.pro"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1661,
780782
/**/
781783
1660,
782784
/**/

0 commit comments

Comments
 (0)