diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 11:10:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-06 09:21:24 +0000 |
| commit | 0ea05f930fb6811da33606cf546057e11a96361c (patch) | |
| tree | 555eecafc2f850c663180f3d516bcc74abae24e9 /external/neon | |
| parent | fc5acf0f608ed279f719e38f9a6e80c326b93fa8 (diff) | |
drop various _MSC_VER < 1900 conditionals
Change-Id: I68d93b260db1f542bb3b44858b61b2d30ae93530
Reviewed-on: https://gerrit.libreoffice.org/34856
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/neon')
| -rw-r--r-- | external/neon/configs/config.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index a2e0c8d9e4bc..c1f138bdd0d4 100644 --- a/external/neon/configs/config.h +++ b/external/neon/configs/config.h @@ -235,16 +235,8 @@ #define HAVE_SIGNAL_H 1 /* Define to 1 if you have the `snprintf' function. */ -#ifdef UNX -#define HAVE_SNPRINTF 1 -#endif - -#ifdef _WIN32 -#if _MSC_VER >= 1900 // VS 2015 +#if defined( UNX ) || defined(_MSC_VER) #define HAVE_SNPRINTF 1 -#else -#define snprintf _snprintf -#endif #endif /* Define to 1 if the system has the type `socklen_t'. */ @@ -337,7 +329,7 @@ /* Define if the timezone global is available */ #ifndef MACOSX #define HAVE_TIMEZONE 1 -#if defined(_MSC_VER) && _MSC_VER >= 1900 // VS 2015 +#if defined(_MSC_VER) #define timezone _timezone #endif #endif @@ -359,7 +351,7 @@ #endif /* Define to 1 if you have the `vsnprintf' function. */ -#if defined( UNX ) || defined(_MSC_VER) +#if defined(UNX) || defined(_MSC_VER) #define HAVE_VSNPRINTF 1 #endif |