# HG changeset patch # User Christian Brabandt # Date 1468436406 -7200 # Node ID cb1b6a72d837f9a2ef213f44cfea88b08f3aa7be # Parent f72e07b577b50d848498149759cefd688cb37fb0 commit https://github.com/vim/vim/commit/3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea Author: Bram Moolenaar Date: Wed Jul 13 20:54:43 2016 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2032, +/**/ 2031, /**/ 2030,