patch 7.4.1885

Problem:    MinGW console build defaults to not having +channel.
Solution:   Include the channel feature if building with huge features. (Ken
            Takata)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 62585e996194fc1d077c520deff32587df1bd467..cdf10aceef3cd2a887c5918a59e582e17292ad0a 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -67,7 +67,11 @@ CSCOPE=yes
 # Set to yes to enable Netbeans support (requires CHANNEL).
 NETBEANS=$(GUI)
 # Set to yes to enable inter process communication.
+ifeq (HUGE, $(FEATURES))
+CHANNEL=yes
+else
 CHANNEL=$(GUI)
+endif
 
 
 # Link against the shared version of libstdc++ by default.  Set

diff --git a/src/version.c b/src/version.c
index 0f9e840caf4a3f0d03f3d6e7d8b57d54e71b2043..e2624cff3ec8ac1c0b7815744bf08104cdd20ae8 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 */
+/**/
+    1885,
 /**/
     1884,
 /**/