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 a865989cf741c3f5c7249d1fc3f5205053e3627b..975ba1170525e54c597cdf7002887f84b89c81c1 100644 (file)
--- 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 e75a60b4339721ce290987cba2e41a42a3f87d5c..d2c3fb870e5c66b61ad02ebed3d027a58d4f2009 100644 (file)
--- 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,
 /**/