summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-06-13 20:49:50 +0200
committerBram Moolenaar <Bram@vim.org>2018-06-13 20:49:50 +0200
commit5ecdf96422af3171cf948865bf057c2a61f042bc (patch)
treeacca9a3e03da6624f81e302eeb0a13e815801a4d
parentffa9684150f5441e84d492e7184ef73587bd6c6c (diff)
downloadvim-git-5ecdf96422af3171cf948865bf057c2a61f042bc.tar.gz
patch 8.1.0054: compiler warning for using %ld for "long long"v8.1.0054
Problem: Compiler warning for using %ld for "long long". Solution: Add a type cast. (closes #3002)
-rw-r--r--src/os_unix.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 71886538e..05ad6b8df 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4199,7 +4199,7 @@ set_child_environment(
# ifdef FEAT_TERMINAL
if (is_terminal)
{
- sprintf((char *)envbuf, "%ld", get_vim_var_nr(VV_VERSION));
+ sprintf((char *)envbuf, "%ld", (long)get_vim_var_nr(VV_VERSION));
setenv("VIM_TERMINAL", (char *)envbuf, 1);
}
# endif
@@ -4227,7 +4227,7 @@ set_child_environment(
if (is_terminal)
{
vim_snprintf(envbuf_Version, sizeof(envbuf_Version),
- "VIM_TERMINAL=%ld", get_vim_var_nr(VV_VERSION));
+ "VIM_TERMINAL=%ld", (long)get_vim_var_nr(VV_VERSION));
putenv(envbuf_Version);
}
# endif
diff --git a/src/version.c b/src/version.c
index 2ea298bc3..90ec0e414 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 54,
+/**/
53,
/**/
52,