patch 7.4.1819
Problem: Compiler warnings when sprintf() is a macro.
Solution: Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
closes #788)
diff --git a/src/fileio.c b/src/fileio.c
index 0ddd079..5626712 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5230,14 +5230,14 @@
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 @@
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
- );
}
}