summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-01-16 19:51:03 +0000
committerBram Moolenaar <Bram@vim.org>2023-01-16 19:51:03 +0000
commitb391e1f805fdd288cbe9103d92c21eff5dcc97c4 (patch)
treefbbe2ad4b1740182b8b9c792c2039d8ffe1c4d55
parent29ac5df37baf7e6e751c7ebd4ab37a2aa826e9e6 (diff)
downloadvim-git-b391e1f805fdd288cbe9103d92c21eff5dcc97c4.tar.gz
patch 9.0.1210: compiler complains about declaration after labelv9.0.1210
Problem: Compiler complains about declaration after label. Solution: Move declaration to beginning of block (John Marriott)
-rw-r--r--src/os_mswin.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 58d8fbea0..5360fa989 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1389,6 +1389,7 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
DEVMODEW *mem;
DEVNAMES *devname;
int i;
+ DWORD err;
bUserAbort = &(psettings->user_abort);
CLEAR_FIELD(prt_dlg);
@@ -1571,8 +1572,7 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
return TRUE;
init_fail_dlg:
- DWORD err = CommDlgExtendedError();
-
+ err = CommDlgExtendedError();
if (err)
{
char_u *buf;
diff --git a/src/version.c b/src/version.c
index 1eb809fd0..c489dba9e 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 */
/**/
+ 1210,
+/**/
1209,
/**/
1208,