patch 9.1.2081: MS-Windows: unnecessary "#ifdef FEAT_GUI" in os_win32.c

Problem:  MS-Windows: "#ifdef FEAT_GUI" exists within "ifdef
          FEAT_GUI_MSWIN", which is confusing when reading the code.
          FEAT_GUI is always defined if FEAT_GUI_MSWIN is defined (see
          vim.h).  Therefore, this check and the else block are
          unnecessary.
Solution: Removed unnecessary "#ifdef FEAT_GUI" (Muraoka Taro).

closes: #19164

Signed-off-by: Muraoka Taro <koron.kaoriya@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/os_win32.c b/src/os_win32.c
index 83f1b1ce3a0944e145411d938e4c1835585e571e..9526a6ae92aaed53e648a0cd825e69533ba5b01e 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4848,7 +4848,6 @@ mch_system_classic(char *cmd, int options)
 
     // Wait for the command to terminate before continuing
     {
-# ifdef FEAT_GUI
        int         delay = 1;
 
        // Keep updating the window while waiting for the shell to finish.
@@ -4872,9 +4871,6 @@ mch_system_classic(char *cmd, int options)
            if (delay < 50)
                delay += 10;
        }
-# else
-       WaitForSingleObject(pi.hProcess, INFINITE);
-# endif
 
        // Get the command exit code
        GetExitCodeProcess(pi.hProcess, &ret);

diff --git a/src/version.c b/src/version.c
index 61e94f5ebb71247766a963410081e21c76ddd24a..126e1cf7754a6753ae33a86dea3ba3c85ddeb60e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2081,
 /**/
     2080,
 /**/