external/neon/configs/config.h | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit 10d93fdb99c0f42c80c1671520a8f60a3ced60de Author: David Ostrovsky <da...@ostrovsky.org> Date: Mon Jul 27 08:12:17 2015 +0200 Fix neon on MSVC 14.0 Change-Id: I389b6c4a4218f71113845d37a610fd621bc4396e Reviewed-on: https://gerrit.libreoffice.org/17359 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index b0fdf22..232ea3c 100644 --- a/external/neon/configs/config.h +++ b/external/neon/configs/config.h @@ -240,8 +240,12 @@ #endif #ifdef WIN32 +#if _MSC_VER >= 1900 // VS 2015 +#define HAVE_SNPRINTF 1 +#else #define snprintf _snprintf #endif +#endif /* Define to 1 if the system has the type `socklen_t'. */ #ifdef UNX @@ -333,6 +337,9 @@ /* Define if the timezone global is available */ #ifndef MACOSX #define HAVE_TIMEZONE 1 +#if defined(_MSC_VER) && _MSC_VER >= 1900 // VS 2015 +#define timezone _timezone +#endif #endif /* Use trio printf replacement library */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits