summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-02-23 22:58:17 +0100
committerBram Moolenaar <Bram@vim.org>2014-02-23 22:58:17 +0100
commit581966e8323c2bab6f9e54729708dc46de8f9fc5 (patch)
tree08294a9870d77e4a3275bf0cefa21eba4ced0e94
parentf30caaf08d2ccbf429cf1eeb910b0ab08b88a40d (diff)
downloadvim-git-581966e8323c2bab6f9e54729708dc46de8f9fc5.tar.gz
updated for version 7.4.190v7.4.190
Problem: Compiler warning for using %lld for off_t. Solution: Add type cast.
-rw-r--r--src/fileio.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 6fcabd917..4a35f04fe 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5294,7 +5294,7 @@ msg_add_lines(insert_space, lnum, nchars)
if (shortmess(SHM_LINES))
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
- "%ldL, %lldC", lnum, nchars
+ "%ldL, %lldC", lnum, (long long)nchars
#else
/* Explicit typecast avoids warning on Mac OS X 10.6 */
"%ldL, %ldC", lnum, (long)nchars
@@ -5312,7 +5312,7 @@ msg_add_lines(insert_space, lnum, nchars)
else
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
- _("%lld characters"), nchars
+ _("%lld characters"), (long long)nchars
#else
/* Explicit typecast avoids warning on Mac OS X 10.6 */
_("%ld characters"), (long)nchars
diff --git a/src/version.c b/src/version.c
index 077b13296..1459a3b48 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 190,
+/**/
189,
/**/
188,