summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-13 14:33:20 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-13 14:33:20 +0200
commit6d1792d4085c9905c9da6ff27065b57cb7cddc57 (patch)
tree392726517d6889b85cec718a23183b5ae1dea5a4
parentd9f31c13d217b4b97f724774a67a6d1f8640e8ae (diff)
downloadvim-git-6d1792d4085c9905c9da6ff27065b57cb7cddc57.tar.gz
patch 8.2.2987: build failure with normal featuresv8.2.2987
Problem: Build failure with normal features. Solution: Remove #define.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c
index 52e4a462b..2800cf4a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2987,
+/**/
2986,
/**/
2985,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index c1e40a68f..04c1ee2f2 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -738,13 +738,12 @@ call_ufunc(
int error;
int idx;
int did_emsg_before = did_emsg;
+ compiletype_T compile_type = CT_NONE;
+
#ifdef FEAT_PROFILE
- compiletype_T compile_type = do_profiling == PROF_YES
- && ufunc->uf_profiling ? CT_PROFILE : CT_NONE;
-#else
-# define compile_type CT_NONE
+ if (do_profiling == PROF_YES && ufunc->uf_profiling)
+ compile_type = CT_PROFILE;
#endif
-
if (func_needs_compiling(ufunc, compile_type)
&& compile_def_function(ufunc, FALSE, compile_type, NULL)
== FAIL)