From 3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 13 Jul 2016 20:54:43 +0200
Subject: patch 7.4.2032 Problem:    Build fails with 64 bit MinGW. (Axel
 Bender) Solution:   Handle dash vs. underscore. (Ken Takata, Hirohito
 Higashi)

---
 src/Make_cyg_ming.mak | 2 +-
 src/version.c         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 9bc24195f..0e21256ec 100644
--- 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 002c1f804..895937eeb 100644
--- 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,
 /**/
-- 
cgit v1.2.1