diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-11 17:22:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-11 17:22:57 +0200 |
| commit | 7edf0baef4e11df982bd37356a4e4d28ff046c86 (patch) | |
| tree | ca2b726b5025817435c0ffe5d373de7da55f8733 /src | |
| parent | 679beba8007b804be210ef118bd23a38cb803ef6 (diff) | |
| download | vim-git-7edf0baef4e11df982bd37356a4e4d28ff046c86.tar.gz | |
patch 8.1.1152: compiler warning with VS2019v8.1.1152
Problem: Compiler warning with VS2019.
Solution: Specify different offset for "AMD64". (closes #4235)
Diffstat (limited to 'src')
| -rw-r--r-- | src/GvimExt/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile index a865989cf..975ba1170 100644 --- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -58,7 +58,7 @@ SUBSYSTEM = console SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) !endif -!if "$(CPU)" == "ARM64" +!if "$(CPU)" == "AMD64" || "$(CPU)" == "ARM64" OFFSET = 0x11C000000 !else OFFSET = 0x1C000000 diff --git a/src/version.c b/src/version.c index e75a60b43..d2c3fb870 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1152, +/**/ 1151, /**/ 1150, |