Mercurial > vim

changeset 9503:cb1b6a72d837 v7.4.2032

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Wed, 13 Jul 2016 21:00:06 +0200
parents f72e07b577b5
children 9022768e9066
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
 
--- 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,