diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-27 08:12:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-30 11:26:20 +0000 |
| commit | 10d93fdb99c0f42c80c1671520a8f60a3ced60de (patch) | |
| tree | 3608b1a0d67a36eae1f3b8d5cc1333ba5103755c | |
| parent | 28ef8e43cdb2944326963c0becc2812a46be5be1 (diff) | |
Fix neon on MSVC 14.0
Change-Id: I389b6c4a4218f71113845d37a610fd621bc4396e
Reviewed-on: https://gerrit.libreoffice.org/17359
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | external/neon/configs/config.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index b0fdf22559e3..232ea3c6916d 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 */ |