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>

7 files changed, 9 insertions, 36 deletions

diff --git a/external/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h
index 638bc4d2e54a..5e22e7a7ea35 100644
--- a/external/clucene/configs/clucene-config-MSVC.h
+++ b/external/clucene/configs/clucene-config-MSVC.h
@@ -49,9 +49,6 @@ typedef unsigned int uint32_t;
 typedef signed long long int64_t;
 typedef unsigned long long uint64_t;
 
-#if _MSC_VER < 1800
-typedef double float_t;
-#endif
 typedef unsigned long _cl_dword_t;
 /* undef size_t size_t */
 
diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch
index 3e769c81871c..658580415ab5 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -56,7 +56,7 @@
  
  /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
     significant byte first (like Motorola and SPARC, unlike Intel). */
-@@ -703,3 +703,40 @@
+@@ -703,3 +703,34 @@
  #ifndef HAVE_SOCKLEN_T
  typedef int socklen_t;
  #endif
@@ -88,15 +88,9 @@
 +#define HAVE_GETPAGESIZE
 +
 +#if defined _MSC_VER
-+#if _MSC_VER < 1500
-+#define vsnprintf _vsnprintf
-+#endif
 +#define isnan _isnan
 +#endif
 +
-+#if _MSC_VER < 1900
-+#define snprintf _snprintf
-+#endif
 --- src/common/common.h	2016-07-15 11:31:26.366735500 +0200
 +++ src/common/common.h	2016-07-17 16:18:39.121579400 +0200
 @@ -551,15 +551,6 @@
diff --git a/external/mysqlcppconn/config.h b/external/mysqlcppconn/config.h
index cad5b6786ed8..eaa929437182 100644
--- a/external/mysqlcppconn/config.h
+++ b/external/mysqlcppconn/config.h
@@ -6,7 +6,7 @@
 #define HAVE_FUNCTION_STRTOL 1
 #define HAVE_FUNCTION_STRTOULL 1
 
-#if defined(MACOSX) || defined(__sun) || defined(LINUX) || (defined _MSC_VER && _MSC_VER >= 1600)
+#if defined(MACOSX) || defined(__sun) || defined(LINUX) || defined (_MSC_VER)
     #define HAVE_STDINT_H
 #ifndef _MSC_VER
     #define HAVE_INTTYPES_H
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
 
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