0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 7.4.1819

Problem:    Compiler warnings when sprintf() is a macro.
Solution:   Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
            closes #788)
This commit is contained in:
Bram Moolenaar
2016-05-05 18:14:03 +02:00
parent 89c79b9932
commit 827b165b2a
4 changed files with 20 additions and 16 deletions

View File

@@ -5230,14 +5230,14 @@ msg_add_lines(
if (insert_space)
*p++ = ' ';
if (shortmess(SHM_LINES))
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
"%ldL, %lldC", lnum, (long long)nchars
sprintf((char *)p,
"%ldL, %lldC", lnum, (long long)nchars);
#else
sprintf((char *)p,
/* Explicit typecast avoids warning on Mac OS X 10.6 */
"%ldL, %ldC", lnum, (long)nchars
"%ldL, %ldC", lnum, (long)nchars);
#endif
);
else
{
if (lnum == 1)
@@ -5248,14 +5248,14 @@ msg_add_lines(
if (nchars == 1)
STRCPY(p, _("1 character"));
else
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
_("%lld characters"), (long long)nchars
sprintf((char *)p,
_("%lld characters"), (long long)nchars);
#else
sprintf((char *)p,
/* Explicit typecast avoids warning on Mac OS X 10.6 */
_("%ld characters"), (long)nchars
_("%ld characters"), (long)nchars);
#endif
);
}
}