Mercurial > vim

changeset 16295:b2ed528e85ef v8.1.1152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1152: compiler warning with VS2019 commit https://github.com/vim/vim/commit/7edf0baef4e11df982bd37356a4e4d28ff046c86 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Apr 11 17:22:57 2019 +0200 patch 8.1.1152: compiler warning with VS2019 Problem: Compiler warning with VS2019. Solution: Specify different offset for "AMD64". (closes https://github.com/vim/vim/issues/4235)
author Bram Moolenaar <Bram@vim.org>
date Thu, 11 Apr 2019 17:30:04 +0200
parents a3281488cfcf
children 854b2ef2377a
files src/GvimExt/Makefile src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,