Mercurial > vim

diff src/proto.h @ 17324:066d77831630 v8.1.1661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1661: cannot build with +textprop but without +balloon_eval commit https://github.com/vim/vim/commit/247bf0de465411e4ebb1c0fe1a9e07f4a7f77e91 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 10 22:21:48 2019 +0200 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 https://github.com/vim/vim/issues/4645)
author Bram Moolenaar <Bram@vim.org>
date Wed, 10 Jul 2019 22:30:04 +0200
parents 3147c7c2e86b
children ba06a1c42274
line wrap: on
line diff
--- a/src/proto.h
+++ b/src/proto.h
@@ -230,12 +230,13 @@ void qsort(void *base, size_t elm_count,
 #  include "if_ruby.pro"
 # endif
 
-/* Ugly solution for "BalloonEval" not being defined while it's used in some
- * .pro files. */
-# ifdef FEAT_BEVAL
+// 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"
-# else
-#  define BalloonEval int
 # endif
 
 # ifdef FEAT_NETBEANS_INTG