Skip to content
Snippets Groups Projects
Commit 6abbc2f55823 authored by Nick Wellnhofer's avatar Nick Wellnhofer
Browse files

Correctly emulate snprintf on older MSVC versions

parent c5743c19d9e6
Branches
No related tags found
No related merge requests found
......@@ -77,14 +77,41 @@
#endif /* _MSC_VER */
#include <direct.h>
#if defined(_MSC_VER) || defined(__MINGW32__)
#if _MSC_VER < 1900
#define snprintf _snprintf
#endif
#if _MSC_VER < 1500
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
#endif
#endif
/* snprintf emulation taken from http://stackoverflow.com/a/8712996/1956010 */
#if defined(_MSC_VER) && _MSC_VER < 1900
#include <stdarg.h>
#include <stdio.h>
#define snprintf c99_snprintf
#define vsnprintf c99_vsnprintf
__inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
{
int count = -1;
if (size != 0)
count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
if (count == -1)
count = _vscprintf(format, ap);
return count;
}
__inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...)
{
int count;
va_list ap;
va_start(ap, format);
count = c99_vsnprintf(outBuf, size, format, ap);
va_end(ap);
return count;
}
#endif /* defined(_MSC_VER) && _MSC_VER < 1900 */
#define HAVE_SYS_STAT_H
#define HAVE__STAT
......
......@@ -57,9 +57,6 @@
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <winsock2.h>
#define gettimeofday(p1,p2)
#if _MSC_VER < 1900
#define snprintf _snprintf
#endif
#endif /* _MS_VER */
#else /* WIN32 */
#if defined(HAVE_SYS_TIME_H)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment