From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 11 Apr 2019 15:22:57 +0000 (+0200)
Subject: patch 8.1.1152: compiler warning with VS2019
X-Git-Tag: v8.1.1152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7edf0baef4e11df982bd37356a4e4d28ff046c86;p=vim

patch 8.1.1152: compiler warning with VS2019

Problem:    Compiler warning with VS2019.
Solution:   Specify different offset for "AMD64". (closes #4235)
---

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
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1152,
 /**/
     1151,
 /**/