patch 8.1.0931: vtp_working included in GUI build but unused

Problem:    vtp_working included in GUI build but unused.
Solution:   Adjust #ifdefs. (Ken Takata, closes #3971)

diff --git a/src/os_win32.c b/src/os_win32.c
index 0680346af06ba3cefdd2cf23511377cbbed796d7..816c3a59cf91decd528f3fd341c7121a2e283561 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -186,12 +186,12 @@ static int win32_getattrs(char_u *name);
 static int win32_setattrs(char_u *name, int attrs);
 static int win32_set_archive(char_u *name);
 
-static int vtp_working = 0;
 static int conpty_working = 0;
 static int conpty_stable = 0;
 static void vtp_flag_init();
 
 #ifndef FEAT_GUI_W32
+static int vtp_working = 0;
 static void vtp_init();
 static void vtp_exit();
 static int vtp_printf(char *format, ...);
@@ -7874,14 +7874,14 @@ is_term_win32(void)
     return T_NAME != NULL && STRCMP(T_NAME, "win32") == 0;
 }
 
-#endif
-
     int
 has_vtp_working(void)
 {
     return vtp_working;
 }
 
+#endif
+
     int
 has_conpty_working(void)
 {

diff --git a/src/version.c b/src/version.c
index e2b6f7a611d0dd13575b0716a9420f5fa2e025f0..00c63e53ce536eb456dcb1000d4d85aaca3fdbad 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    931,
 /**/
     930,
 /**/