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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto.h
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" # include "if_ruby.pro"
# endif # endif
/* Ugly solution for "BalloonEval" not being defined while it's used in some // Ugly solution for "BalloonEval" not being defined while it's used in some
* .pro files. */ // .pro files.
# ifdef FEAT_BEVAL # ifndef FEAT_BEVAL
# include "beval.pro"
# else
# define BalloonEval int # define BalloonEval int
# endif # endif
# if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
# include "beval.pro"
# endif
# ifdef FEAT_NETBEANS_INTG # ifdef FEAT_NETBEANS_INTG
# include "netbeans.pro" # include "netbeans.pro"

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1661,
/**/ /**/
1660, 1660,
/**/ /**/