patch 8.1.1304: MS-Windows: compiler warning for unused value

brammool · brammool · commit 68cbb14bae10 · 2019-05-09T14:14:42.000+02:00
Problem:    MS-Windows: compiler warning for unused value.
Solution:   Adjust #ifdefs. (Ken Takata, closes #4363)
diff --git a/src/gui.c b/src/gui.c
@@ -69,7 +69,7 @@ gui_start(char_u *arg UNUSED)
 {
     char_u	*old_term;
     static int	recursive = 0;
-#ifdef GUI_MAY_SPAWN
+#if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD)
     char	*msg = NULL;
 #endif
 
@@ -113,7 +113,10 @@ gui_start(char_u *arg UNUSED)
 # endif
 	    )
     {
-	msg = gui_mch_do_spawn(arg);
+# ifdef EXPERIMENTAL_GUI_CMD
+	msg =
+# endif
+	    gui_mch_do_spawn(arg);
     }
     else
 #endif
diff --git a/src/version.c b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1304,
 /**/
     1303,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ gui_start(char_u *arg UNUSED)`
`69`	`69`	`{`
`70`	`70`	`char_u *old_term;`
`71`	`71`	`static int recursive = 0;`
`72`		`-#ifdef GUI_MAY_SPAWN`
	`72`	`+#if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD)`
`73`	`73`	`char *msg = NULL;`
`74`	`74`	`#endif`
`75`	`75`
`@@ -113,7 +113,10 @@ gui_start(char_u *arg UNUSED)`
`113`	`113`	`# endif`
`114`	`114`	`)`
`115`	`115`	`{`
`116`		`- msg = gui_mch_do_spawn(arg);`
	`116`	`+# ifdef EXPERIMENTAL_GUI_CMD`
	`117`	`+ msg =`
	`118`	`+# endif`
	`119`	`+ gui_mch_do_spawn(arg);`
`117`	`120`	`}`
`118`	`121`	`else`
`119`	`122`	`#endif`