diff options
| author | Daniel Veillard <veillard@redhat.com> | 2014-10-13 15:17:30 +0800 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2014-10-13 15:17:30 +0800 |
| commit | 73e08bf7c36a9145d38f51d37e66529b873c011a (patch) | |
| tree | 90f6b45e5d430b17314ee7e4d81ef9d8e65d4cdd | |
| parent | ec39a33e02d3b337f3f25602659a33d4b30aa31a (diff) | |
| download | libxslt-73e08bf7c36a9145d38f51d37e66529b873c011a.tar.gz | |
Visual Studio 14 CTP defines snprintf()
Related to https://bugzilla.gnome.org/show_bug.cgi?id=737937
related changes for libxslt
| -rw-r--r-- | libxslt/win32config.h | 2 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 2 |
2 files changed, 4 insertions, 0 deletions
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 <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 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 <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) |