summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-11-28 19:11:02 +0000
committerBram Moolenaar <Bram@vim.org>2022-11-28 19:11:02 +0000
commitf86490ed4fdab213a28f667abd055c023a73d645 (patch)
tree250d6629cc136530884ee25fa461551640de608c
parente76062c078debed0df818f70e4db14ad7a7cb53a (diff)
downloadvim-git-f86490ed4fdab213a28f667abd055c023a73d645.tar.gz
patch 9.0.0966: some compilers don't allow a declaration after a labelv9.0.0966
Problem: Some compilers don't allow a declaration after a label. Solution: Move the declaration to the start of the block. (John Marriott)
-rw-r--r--src/screen.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index 7c3a6d7b0..3bf15d6c8 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2383,6 +2383,7 @@ screenalloc(int doclear)
static int entered = FALSE; // avoid recursiveness
static int done_outofmem_msg = FALSE; // did outofmem message
int retry_count = 0;
+ int found_null;
retry:
/*
@@ -2509,8 +2510,7 @@ retry:
#endif
give_up:
-
- int found_null = FALSE;
+ found_null = FALSE;
for (int i = 0; i < p_mco; ++i)
if (new_ScreenLinesC[i] == NULL)
{
diff --git a/src/version.c b/src/version.c
index 8d51ea702..240def453 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 966,
+/**/
965,
/**/
964,