patch 9.0.1210: compiler complains about declaration after label

Problem:    Compiler complains about declaration after label.
Solution:   Move declaration to beginning of block (John Marriott)

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 58d8fbea00f051e2d56e6f4e665b25078dd278dc..5360fa9894e24fcb4aae12a20c0e43384ccb72f0 100644 (file)
--- 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 1eb809fd016e2ff52b13fe75836e928081a8734e..c489dba9e242ed304956e9123ce35d3cb16c5879 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1210,
 /**/
     1209,
 /**/