patch 7.4.1880

Problem:    MS-Windows console build defaults to not having +channel.
Solution:   Include the channel feature if building with huge features.

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 841dbd4efd4019f470c570cd65873c3373ba07a5..c4529b72bdf31e456eff60f4a9c4b7013b5c4e55 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -263,6 +263,10 @@ WP64CHECK = /Wp64
 # INCLUDE = c:\msvc20\include
 # LIB = c:\msvc20\lib
 
+!if "$(FEATURES)"==""
+FEATURES = HUGE
+!endif
+
 !ifndef CTAGS
 CTAGS = ctags
 !endif
@@ -283,8 +287,12 @@ NETBEANS = $(GUI)
 !endif
 
 !ifndef CHANNEL
+!if "$(FEATURES)"=="HUGE"
+CHANNEL = yes
+!else
 CHANNEL = $(GUI)
 !endif
+!endif
 
 # Only allow NETBEANS and XPM for a GUI build and CHANNEL.
 !if "$(GUI)" == "yes"
@@ -953,9 +961,6 @@ CFLAGS = $(CFLAGS) -DMSWINPS
 #
 # FEATURES: TINY, SMALL, NORMAL, BIG or HUGE
 #
-!if "$(FEATURES)"==""
-FEATURES = HUGE
-!endif
 CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
 
 #

diff --git a/src/version.c b/src/version.c
index 7373e70ddc67275f8a51dd606e64b13c71ed682e..9cf3972cbd53d1ba116196206efef3fc15c64d34 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1880,
 /**/
     1879,
 /**/