From 2196bce56fcd56b0eaece50c079bac99f5bc31af Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 12 Apr 2020 20:01:11 +0200 Subject: [PATCH] patch 8.2.0560: compiler warning in tiny build Problem: Compiler warning in tiny build. Solution: Move declaration inside #ifdef. (Dominique Pelle, closes #5915) --- src/ex_docmd.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index d979f43efc..1cc231deed 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -647,9 +647,9 @@ do_cmdline( # define cmd_cookie cookie #endif static int call_depth = 0; // recursiveness +#ifdef FEAT_EVAL ESTACK_CHECK_DECLARATION -#ifdef FEAT_EVAL // For every pair of do_cmdline()/do_one_cmd() calls, use an extra memory // location for storing error messages to be converted to an exception. // This ensures that the do_errthrow() call in do_one_cmd() does not @@ -1295,7 +1295,7 @@ do_cmdline( /* * On an interrupt or an aborting error not converted to an exception, * disable the conversion of errors to exceptions. (Interrupts are not - * converted any more, here.) This enables also the interrupt message + * converted anymore, here.) This enables also the interrupt message * when force_abort is set and did_emsg unset in case of an interrupt * from a finally clause after an error. */ diff --git a/src/version.c b/src/version.c index f9d8a5a82c..3ef50fb7e2 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 560, /**/ 559, /**/