We only support MSVC 2008 (_MSC_VER 1500) or later

We can drop or simplify many conditionals.

Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97

6 files changed, 6 insertions, 20 deletions

diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 01a093b18135..03e24c6c6394 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -39,20 +39,6 @@
 #define _USE_MATH_DEFINES // needed by Visual C++ for math constants
 #endif
 
-/* warnings ought to be disabled using /wd:n option of msvc.net compiler */
-#if _MSC_VER < 1300
-/* no performance warning: int to bool */
-#pragma warning( disable : 4800 )
-
-/* No warning for: C++ Exception Specification ignored */
-#pragma warning( disable : 4290 )
-
-#if OSL_DEBUG_LEVEL > 0
-/* No warning for: identifier was truncated to '255' characters in the browser information */
-#pragma warning( disable : 4786 )
-#endif
-#endif /* defined _MSC_VER < 1300 */
-
 #endif /* defined _MSC_VER */
 
 /* Provide ISO C99 compatible versions of snprint and vsnprintf */
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 3e3dc7c3cdcd..318bfa7bfa68 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -84,7 +84,7 @@ typedef unsigned char       sal_uInt8;
      #error "Could not find 32-bit type, add support for your architecture"
 #endif
 
-#if defined _MSC_VER && _MSC_VER >= 1000
+#ifdef _MSC_VER
     typedef __int64                  sal_Int64;
     typedef unsigned __int64         sal_uInt64;
 
diff --git a/sal/rtl/source/string.cxx b/sal/rtl/source/string.cxx
index 89d69c592ed2..a68c0932d115 100644
--- a/sal/rtl/source/string.cxx
+++ b/sal/rtl/source/string.cxx
@@ -19,7 +19,7 @@
 
 #include "sal/config.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#ifdef _MSC_VER
 #pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance
 #endif
 
diff --git a/sal/rtl/source/ustring.cxx b/sal/rtl/source/ustring.cxx
index 0216428da5ab..bdebd897a71b 100644
--- a/sal/rtl/source/ustring.cxx
+++ b/sal/rtl/source/ustring.cxx
@@ -19,7 +19,7 @@
 
 #include "sal/config.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#ifdef _MSC_VER
 #pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance
 #endif
 
diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c
index 2218d1d77a8a..3a7c54c6dff5 100644
--- a/sal/systools/win32/uwinapi/legacy.c
+++ b/sal/systools/win32/uwinapi/legacy.c
@@ -25,7 +25,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#ifdef _MSC_VER
 #pragma warning(disable:4273)       // inconsistent dll linkage
 #endif
 
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 704c0887fa7a..12eaee9f252d 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -29,11 +29,11 @@
 #include <tchar.h>
 #include <systools/win32/snprintf.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#ifdef _MSC_VER
 #pragma warning(disable:4273)       // inconsistent dll linkage
 #endif
 
-#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18))))
+#if defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18)))
 
 /*  The non-debug versions of _vscprintf/_scprintf are just calls
     to _vsprintf/_sprintf with string buffer pointer set to NULL,