patch 8.2.0405: MSVC: build fails with some combination of features

Problem:    MSVC: build fails with some combination of features.
Solution:   Enable CHANNEL if TERMINAL is enabled. (Mike Williams)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5be53cf6ad9eb90ee14fd2fbc6eaa03909428624..a6825d58278739399edb0ba804cf9438b59985b2 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -38,7 +38,8 @@
 #        is yes)
 #      Global IME support: GIME=yes (requires GUI=yes)
 #
-#      Terminal support: TERMINAL=yes (default is yes)
+#      Terminal support: TERMINAL=yes (default is yes if FEATURES is HUGE)
+#        Will also enable CHANNEL
 #
 #      Sound support: SOUND=yes (default is yes)
 #
@@ -109,13 +110,13 @@
 #      PostScript printing: POSTSCRIPT=yes (default is no)
 #
 #      Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
-#      Requires CHANNEL.
+#        Requires CHANNEL.
 #
 #      Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
 #      doesn't work)
 #
 #      Inter process communication: CHANNEL=[yes or no] (default is yes if GUI
-#      is yes)
+#      is yes or TERMINAL is yes)
 #
 #      XPM Image Support: XPM=[path to XPM directory]
 #      Default is "xpm", using the files included in the distribution.
@@ -388,7 +389,7 @@ NETBEANS = $(GUI)
 !endif
 
 !ifndef CHANNEL
-! if "$(FEATURES)"=="HUGE"
+! if "$(FEATURES)"=="HUGE" || "$(TERMINAL)"=="yes"
 CHANNEL = yes
 ! else
 CHANNEL = $(GUI)

diff --git a/src/version.c b/src/version.c
index b709dbbf860c4880b766f16ba52bf7fb7301b0d3..ed2f86dcbdf064a9f276bf046e829aef86d0c240 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    405,
 /**/
     404,
 /**/