Permalink
Browse files

patch 8.0.1726: older MSVC doesn't support declarations halfway a block

Problem:    Older MSVC doesn't support declarations halfway a block.
Solution:   Move the declaration back to the start of the block.
  • Loading branch information...
brammool committed Apr 16, 2018
1 parent 32c67ba commit df2c774ded4c2ed169390a352099c23b6db657c4
Showing with 8 additions and 6 deletions.
  1. +6 −6 src/main.c
  2. +2 −0 src/version.c
@@ -1056,6 +1056,7 @@ main_loop(
int cmdwin, /* TRUE when working in the command-line window */
int noexmode) /* TRUE when return on entering Ex mode */
{
oparg_T oa; /* operator arguments */
volatile int previous_got_int = FALSE; /* "got_int" was TRUE */
#ifdef FEAT_CONCEAL
/* these are static to avoid a compiler warning */
@@ -1095,7 +1096,6 @@ main_loop(
}
#endif
oparg_T oa; /* operator arguments */
clear_oparg(&oa);
while (!cmdwin
#ifdef FEAT_CMDWIN
@@ -1383,11 +1383,6 @@ getout_preserve_modified(int exitval)
void
getout(int exitval)
{
tabpage_T *tp;
tabpage_T *next_tp;
buf_T *buf;
win_T *wp;
exiting = TRUE;
#if defined(FEAT_JOB_CHANNEL)
ch_log(NULL, "Exiting...");
@@ -1416,6 +1411,11 @@ getout(int exitval)
if (v_dying <= 1)
{
tabpage_T *tp;
tabpage_T *next_tp;
buf_T *buf;
win_T *wp;
/* Trigger BufWinLeave for all windows, but only once per buffer. */
for (tp = first_tabpage; tp != NULL; tp = next_tp)
{
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1726,
/**/
1725,
/**/

0 comments on commit df2c774

Please sign in to comment.