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 | |
| 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/redland')
| -rw-r--r-- | external/redland/raptor/raptor_config.h | 6 | ||||
| -rw-r--r-- | external/redland/rasqal/rasqal-msvc.patch.1 | 6 | ||||
| -rw-r--r-- | external/redland/redland/redland-msvc.patch.1 | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/external/redland/raptor/raptor_config.h b/external/redland/raptor/raptor_config.h index b69550dcfd34..3e94fee947ad 100644 --- a/external/redland/raptor/raptor_config.h +++ b/external/redland/raptor/raptor_config.h @@ -364,13 +364,7 @@ # endif # ifdef _MSC_VER -# if _MSC_VER >= 1300 # define __func__ __FUNCTION__ -# else - /* better than nothing */ -# define raptor_str(s) #s -# define __func__ "func@" __FILE__ ":" raptor_str(__LINE__) -# endif # endif # define RAPTOR_INLINE __inline 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 diff --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 index c69366bc23f5..1b170989fd1e 100644 --- a/external/redland/redland/redland-msvc.patch.1 +++ b/external/redland/redland/redland-msvc.patch.1 @@ -1,12 +1,10 @@ --- redland.orig/src/win32_rdf_config.h 2015-09-02 23:12:12.894126138 +0200 +++ redland/src/win32_rdf_config.h 2015-09-02 23:23:54.600173246 +0200 -@@ -43,7 +43,9 @@ +@@ -43,7 +43,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 |