diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-13 20:54:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-13 20:54:43 +0200 |
| commit | 3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea (patch) | |
| tree | 73187cb31a3668baeeb08d23d6aa5a73f702c8c8 | |
| parent | 89b10421ca1aea55acbafac1df93be4e20210ceb (diff) | |
| download | vim-git-3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea.tar.gz | |
patch 7.4.2032v7.4.2032
Problem: Build fails with 64 bit MinGW. (Axel Bender)
Solution: Handle dash vs. underscore. (Ken Takata, Hirohito Higashi)
| -rw-r--r-- | src/Make_cyg_ming.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2032, +/**/ 2031, /**/ 2030, |