[Libreoffice-commits] core.git: connectivity/source external/clucene external/firebird external/mysqlcppconn external/neon external/redland onlineupdate/source sal/osl soltools/mkdepend stoc/source vcl/source winaccessibility/source
Caolán McNamara
caolanm at redhat.com
Mon Mar 6 09:22:06 UTC 2017
connectivity/source/inc/file/fcode.hxx | 2 --
external/clucene/configs/clucene-config-MSVC.h | 3 ---
external/firebird/firebird-cygwin-msvc.patch | 8 +-------
external/mysqlcppconn/config.h | 2 +-
external/neon/configs/config.h | 14 +++-----------
external/redland/raptor/raptor_config.h | 6 ------
external/redland/rasqal/rasqal-msvc.patch.1 | 6 ++----
external/redland/redland/redland-msvc.patch.1 | 6 ++----
onlineupdate/source/update/common/updatedefines.h | 22 ----------------------
sal/osl/w32/salinit.cxx | 6 ------
soltools/mkdepend/main.c | 2 +-
stoc/source/javavm/javavm.cxx | 2 +-
vcl/source/opengl/OpenGLHelper.cxx | 13 +------------
winaccessibility/source/UAccCOM/stdafx.h | 2 --
14 files changed, 12 insertions(+), 82 deletions(-)
New commits:
commit 0ea05f930fb6811da33606cf546057e11a96361c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 3 11:10:18 2017 +0000
drop various _MSC_VER < 1900 conditionals
Change-Id: I68d93b260db1f542bb3b44858b61b2d30ae93530
Reviewed-on: https://gerrit.libreoffice.org/34856
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index d3a3b8a..fe66e3c 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -44,7 +44,6 @@ namespace connectivity
public:
//virtual dtor to allow this to be the root of the class hierarchy
virtual ~OCode();
-#if !defined _MSC_VER || _MSC_VER >= 1900
//but that disables the default move ctor
OCode(OCode&&) = default;
//but that disables the rest of default ctors
@@ -53,7 +52,6 @@ namespace connectivity
//and same issue for the assignment operators
OCode& operator=(const OCode&) = default;
OCode& operator=(OCode&&) = default;
-#endif
static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
diff --git a/external/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h
index 638bc4d..5e22e7a 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 3e769c8..6585804 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 cad5b67..eaa9294 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 a2e0c8d..c1f138b 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 b69550d..3e94fee 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 79fce7a..ff4e5b5 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 c69366b..1b17098 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
diff --git a/onlineupdate/source/update/common/updatedefines.h b/onlineupdate/source/update/common/updatedefines.h
index 7347310..95969b1 100644
--- a/onlineupdate/source/update/common/updatedefines.h
+++ b/onlineupdate/source/update/common/updatedefines.h
@@ -38,9 +38,6 @@
# define access _access
# define putenv _putenv
-# if _MSC_VER < 1900
-# define stat _stat
-# endif
# define DELETE_DIR L"tobedeleted"
# define CALLBACK_BACKUP_EXT L".moz-callback"
@@ -48,25 +45,6 @@
# define NS_T(str) L ## str
# define NS_SLASH NS_T('\\')
-#if defined(_MSC_VER) && _MSC_VER < 1900
-// On Windows, _snprintf and _snwprintf don't guarantee null termination. These
-// macros always leave room in the buffer for null termination and set the end
-// of the buffer to null in case the string is larger than the buffer. Having
-// multiple nulls in a string is fine and this approach is simpler (possibly
-// faster) than calculating the string length to place the null terminator and
-// truncates the string as _snprintf and _snwprintf do on other platforms.
-static inline int mysnprintf(char* dest, size_t count, const char* fmt, ...)
-{
- size_t _count = count - 1;
- va_list varargs;
- va_start(varargs, fmt);
- int result = _vsnprintf(dest, count - 1, fmt, varargs);
- va_end(varargs);
- dest[_count] = '\0';
- return result;
-}
-#define snprintf mysnprintf
-#endif
static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...)
{
size_t _count = count - 1;
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index 1c482fa..2b7d338 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -32,12 +32,6 @@ extern "C" {
void sal_detail_initialize(int argc, char ** argv)
{
-#if defined(_WIN64) && _MSC_VER <= 1800
- // tdf#99410: MSVC 2013 runtime library has problems with some math functions if
- // the CPU supports them and they are disabled in the OS
- _set_FMA3_enable(0);
-#endif
-
sal_initGlobalTimer();
// SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
// SetDllDirectoryW(L"");
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index 997ba6d..438db70 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -40,7 +40,7 @@ in this Software without prior written authorization from the X Consortium.
#ifdef _MSC_VER /* Define ssize_t */
#if !defined(_W64)
-#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86))
#define _W64 __w64
#else
#define _W64
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 7bf88cc..224768d 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -514,7 +514,7 @@ void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
tmData = localtime(&clock);
#ifdef MACOSX
char * p = tmData->tm_zone;
-#elif defined(_MSC_VER) && _MSC_VER >= 1900
+#elif defined(_MSC_VER)
char * p = _tzname[0];
(void)tmData;
#else
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 76039a3..1969f01 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -818,21 +818,10 @@ namespace {
}
WatchdogTimings::WatchdogTimings()
- : maTimingValues
-#if defined _MSC_VER && _MSC_VER <= 1800
- // note: Apple clang's parser segfaults on this
- (
-#else
- // note: MSVC 2013 can't parse this, error C2797
- {
-#endif
+ : maTimingValues{
{{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */,
{60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */}
-#if defined _MSC_VER && _MSC_VER <= 1800
- )
-#else
}
-#endif
, mbRelaxed(false)
{
}
diff --git a/winaccessibility/source/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h
index b9a7d3e..12bf35a 100644
--- a/winaccessibility/source/UAccCOM/stdafx.h
+++ b/winaccessibility/source/UAccCOM/stdafx.h
@@ -24,9 +24,7 @@
#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_STDAFX_H
#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_STDAFX_H
-#if _MSC_VER > 1000
#pragma once
-#endif // _MSC_VER > 1000
// this turns off ATL's locking in the COM component implementations
// (we don't need it since we use SolarMutex instead)
More information about the Libreoffice-commits
mailing list