Mercurial > vim
diff src/fileio.c @ 9068:0a3bc9fdea20 v7.4.1819
commit https://github.com/vim/vim/commit/827b165b2aebad2cfe98cc6d5804c6c0fe8afd89
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 5 18:14:03 2016 +0200
patch 7.4.1819
Problem: Compiler warnings when sprintf() is a macro.
Solution: Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
closes https://github.com/vim/vim/issues/788)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 05 May 2016 18:15:05 +0200 |
| parents | da4f6e238374 |
| children | d2b9e454c73d |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -5230,14 +5230,14 @@ msg_add_lines( if (insert_space) *p++ = ' '; if (shortmess(SHM_LINES)) +#ifdef LONG_LONG_OFF_T sprintf((char *)p, -#ifdef LONG_LONG_OFF_T - "%ldL, %lldC", lnum, (long long)nchars + "%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 -#endif - ); + "%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 +#ifdef LONG_LONG_OFF_T sprintf((char *)p, -#ifdef LONG_LONG_OFF_T - _("%lld characters"), (long long)nchars + _("%lld characters"), (long long)nchars); #else + sprintf((char *)p, /* Explicit typecast avoids warning on Mac OS X 10.6 */ - _("%ld characters"), (long)nchars -#endif - ); + _("%ld characters"), (long)nchars); +#endif } }