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/redland/rasqal/rasqal-msvc.patch.1 | |
| parent | sw: prefix members of SwRectFnSet (diff) | |
| download | core-0ea05f930fb6811da33606cf546057e11a96361c.tar.gz core-0ea05f930fb6811da33606cf546057e11a96361c.zip | |
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/redland/rasqal/rasqal-msvc.patch.1')
| -rw-r--r-- | external/redland/rasqal/rasqal-msvc.patch.1 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1 index 79fce7a8dc5e..ff4e5b5a725e 100644 --- a/external/redland/rasqal/rasqal-msvc.patch.1 +++ b/external/redland/rasqal/rasqal-msvc.patch.1 @@ -1,13 +1,11 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h --- rasqal.orig/src/win32_rasqal_config.h 2015-09-02 23:12:00.733125322 +0200 +++ rasqal/src/win32_rasqal_config.h 2015-09-02 23:28:10.152190403 +0200 -@@ -31,7 +31,9 @@ +@@ -31,7 +31,6 @@ /* MS names for these functions */ // next line breaks build on wntmsci12 //#define vsnprintf _vsnprintf -+#if _MSC_VER < 1900 // older than VC 2015 - #define snprintf _snprintf -+#endif +-#define snprintf _snprintf #define access _access #define stricmp _stricmp #define strnicmp _strnicmp |