diff options
author | Nick Wellnhofer <wellnhofer@aevum.de> | 2019-01-30 14:56:54 +0100 |
---|---|---|
committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2019-02-12 12:31:20 +0100 |
commit | d5d511f0b7190229b4f3ddea9ef64c9210a99681 (patch) | |
tree | b714d0bcb50aebaa10d1ed271837db8eff7af942 /python | |
parent | 1ffe17a071468a51e6f32b7d6d70da4b9424cca9 (diff) | |
download | libxslt-d5d511f0b7190229b4f3ddea9ef64c9210a99681.tar.gz |
Fix vsnprintf in Python bindings on Windows
- Fix vsnprintf on older MSVC versions
- Stop using _vsnprintf on MinGW
Diffstat (limited to 'python')
-rw-r--r-- | python/libxslt.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/python/libxslt.c b/python/libxslt.c index ee26d689..f8371b7b 100644 --- a/python/libxslt.c +++ b/python/libxslt.c @@ -23,8 +23,29 @@ #include <stdio.h> #include <stddef.h> -#if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(vsnprintf) -#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) +#ifdef _MSC_VER + +/* snprintf emulation taken from http://stackoverflow.com/a/8712996/1956010 */ +#if _MSC_VER < 1900 + +#include <stdarg.h> + +#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; +} + +#endif /* _MSC_VER < 1900 */ + #elif defined(XSLT_NEED_TRIO) #include "trio.h" #define vsnprintf trio_vsnprintf |