From 73e08bf7c36a9145d38f51d37e66529b873c011a Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 13 Oct 2014 15:17:30 +0800 Subject: Visual Studio 14 CTP defines snprintf() Related to https://bugzilla.gnome.org/show_bug.cgi?id=737937 related changes for libxslt --- libxslt/win32config.h | 2 ++ xsltproc/xsltproc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libxslt/win32config.h b/libxslt/win32config.h index e1ceae10..33bc5700 100644 --- a/libxslt/win32config.h +++ b/libxslt/win32config.h @@ -78,7 +78,9 @@ static int isnan (double d) { #include #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 diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 66d8cbbc..de4605e6 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -57,7 +57,9 @@ #if defined(_MSC_VER) || defined(__MINGW32__) #include #define gettimeofday(p1,p2) +#if _MSC_VER < 1900 #define snprintf _snprintf +#endif #endif /* _MS_VER */ #else /* WIN32 */ #if defined(HAVE_SYS_TIME_H) -- cgit v1.2.1