patch 7.4.2032

Problem:    Build fails with 64 bit MinGW. (Axel Bender)
Solution:   Handle dash vs. underscore. (Ken Takata, Hirohito Higashi)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 9bc24195fe3609ae6fa9a3a13f5189f6d2baeda7..0e21256ec85d82a7309f38d4863d36afa46355e0 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -149,7 +149,7 @@ WINDRES_CC = $(CC)
 
 # Get the default ARCH.
 ifndef ARCH
-ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//')
+ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//' -e 's/_/-/')
 endif
 
 

diff --git a/src/version.c b/src/version.c
index 002c1f804e15e2a5a06117861627521728bfc256..895937eeb479957fdfc4bfd317b2a6adadfaf727 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2032,
 /**/
     2031,
 /**/