lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

Correctly emulate snprintf on older MSVC versions

Browse Source 
This uses the code taken from http://stackoverflow.com/a/8712996/1956010

Fixes bug #756691
https://bugzilla.gnome.org/show_bug.cgi?id=756691
This commit is contained in:
Nick Wellnhofer
2016-02-24 16:47:40 +01:00
parent ea5a2b30c9
commit e75b5da121
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libxslt/win32config.h
View File

@ -77,14 +77,41 @@ static int isnan (double d) {
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#include <direct.h> #include <direct.h>
#if defined(_MSC_VER) || defined(__MINGW32__)
#if _MSC_VER < 1900 /* snprintf emulation taken from http://stackoverflow.com/a/8712996/1956010 */
#define snprintf _snprintf #if defined(_MSC_VER) && _MSC_VER < 1900
#endif
#if _MSC_VER < 1500 #include <stdarg.h>
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) #include <stdio.h>
#endif
#endif #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_SYS_STAT_H
#define HAVE__STAT #define HAVE__STAT

3
xsltproc/xsltproc.c
View File

@ -57,9 +57,6 @@
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#include <winsock2.h> #include <winsock2.h>
#define gettimeofday(p1,p2) #define gettimeofday(p1,p2)
#if _MSC_VER < 1900
#define snprintf _snprintf
#endif
#endif /* _MS_VER */ #endif /* _MS_VER */
#else /* WIN32 */ #else /* WIN32 */
#if defined(HAVE_SYS_TIME_H) #if defined(HAVE_SYS_TIME_H)