summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-10 13:42:43 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-10 13:42:43 +0200
commitd695ba732de915fc227c1069a7a4e1d5049601bd (patch)
treeedb18dc2dded07e3f3ba3f2f8d2da1a0d5d219bd
parent3b6a6eb7b4e0ac5b75dd2518bd27bce2b13298a3 (diff)
patch 8.2.0727: MS-Windows: new gcc compiler does not support scanf formatv8.2.0727
Problem: MS-Windows: new gcc compiler does not support scanf format. Solution: Use "%ll" instead of "%I". (Ken Takata)
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c
index ef7dedb980..55b865409e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 727,
+/**/
726,
/**/
725,
diff --git a/src/vim.h b/src/vim.h
index c84d5a596c..9e4c61db37 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -340,9 +340,9 @@ typedef unsigned int int_u;
#ifdef _WIN64
typedef unsigned __int64 long_u;
typedef __int64 long_i;
-# define SCANF_HEX_LONG_U "%Ix"
-# define SCANF_DECIMAL_LONG_U "%Iu"
-# define PRINTF_HEX_LONG_U "0x%Ix"
+# define SCANF_HEX_LONG_U "%llx"
+# define SCANF_DECIMAL_LONG_U "%llu"
+# define PRINTF_HEX_LONG_U "0x%llx"
#else
// Microsoft-specific. The __w64 keyword should be specified on any typedefs
// that change size between 32-bit and 64-bit platforms. For any such type,