Diff
Modified: trunk/Source/WTF/ChangeLog (211172 => 211173)
--- trunk/Source/WTF/ChangeLog 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/ChangeLog 2017-01-25 23:37:26 UTC (rev 211173)
@@ -1,3 +1,14 @@
+2017-01-25 Konstantin Tokarev <[email protected]>
+
+ Removed leftovers of pre-2015 VisualStudio support
+ https://bugs.webkit.org/show_bug.cgi?id=167434
+
+ Reviewed by Alex Christensen.
+
+ * wtf/Compiler.h:
+ * wtf/Platform.h:
+ * wtf/StringExtras.h:
+
2017-01-25 Chris Dumez <[email protected]>
Disable Download attribute support on iOS
Modified: trunk/Source/WTF/wtf/Compiler.h (211172 => 211173)
--- trunk/Source/WTF/wtf/Compiler.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/Compiler.h 2017-01-25 23:37:26 UTC (rev 211173)
@@ -119,16 +119,14 @@
/* COMPILER(MSVC) - Microsoft Visual C++ */
#if defined(_MSC_VER)
+
#define WTF_COMPILER_MSVC 1
-
-#if _MSC_VER >= 1900
#define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 1
-#endif
+#if _MSC_VER < 1900
+#error "Please use a newer version of Visual Studio. WebKit requires VS2015 or newer to compile."
#endif
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#error "Please use a newer version of Visual Studio. WebKit requires VS2013 or newer to compile."
#endif
/* COMPILER(SUNCC) */
Modified: trunk/Source/WTF/wtf/Platform.h (211172 => 211173)
--- trunk/Source/WTF/wtf/Platform.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/Platform.h 2017-01-25 23:37:26 UTC (rev 211173)
@@ -1137,11 +1137,7 @@
#define __STDC_FORMAT_MACROS
#undef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
-#if _MSC_VER < 1900
-#undef _HAS_EXCEPTIONS
-#define _HAS_EXCEPTIONS 1
#endif
-#endif
#if PLATFORM(MAC)
#define HAVE_NS_ACTIVITY 1
Modified: trunk/Source/WTF/wtf/StringExtras.h (211172 => 211173)
--- trunk/Source/WTF/wtf/StringExtras.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/StringExtras.h 2017-01-25 23:37:26 UTC (rev 211173)
@@ -35,54 +35,6 @@
#include <strings.h>
#endif
-#if COMPILER(MSVC) && _MSC_VER < 1900
-
-// In versions of the Microsoft library before Visual Studio 2015, snprintf and vsnprintf
-// did not null-terminate when the result entirely filled the buffer. The following work
-// around that limitation. This means that any file using snprintf or vsnprintf needs to
-// include this header and use the global namespace style to invoke it, not the std
-// namespace style.
-
-#include <errno.h>
-
-inline int snprintf(char* buffer, size_t count, const char* format, ...)
-{
- int result;
- va_list args;
- va_start(args, format);
- result = _vsnprintf(buffer, count, format, args);
- if (result < 0 && errno != EINVAL)
- result = _vscprintf(format, args);
- va_end(args);
-
- // In the case where the string entirely filled the buffer, _vsnprintf will not
- // null-terminate it, but snprintf must.
- if (count > 0)
- buffer[count - 1] = '\0';
-
- return result;
-}
-
-inline double wtf_vsnprintf(char* buffer, size_t count, const char* format, va_list args)
-{
- int result = _vsnprintf(buffer, count, format, args);
- if (result < 0 && errno != EINVAL)
- result = _vscprintf(format, args);
-
- // In the case where the string entirely filled the buffer, _vsnprintf will not
- // null-terminate it, but vsnprintf must.
- if (count > 0)
- buffer[count - 1] = '\0';
-
- return result;
-}
-
-// Work around a difference in Microsoft's implementation of vsnprintf, where
-// vsnprintf does not null terminate the buffer. WebKit can rely on the null termination.
-#define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args)
-
-#endif
-
#if COMPILER(MSVC)
// FIXME: We should stop using these entirely and use suitable versions of equalIgnoringASCIICase instead.
Modified: trunk/Source/WebCore/ChangeLog (211172 => 211173)
--- trunk/Source/WebCore/ChangeLog 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 23:37:26 UTC (rev 211173)
@@ -1,3 +1,15 @@
+2017-01-25 Konstantin Tokarev <[email protected]>
+
+ Removed leftovers of pre-2015 VisualStudio support
+ https://bugs.webkit.org/show_bug.cgi?id=167434
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * platform/graphics/filters/FEConvolveMatrix.cpp: Replaced MSC_VER
+ usage with COMPILER(MSVC)
+
2017-01-25 Youenn Fablet <[email protected]>
Fixing typos in r211161
Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (211172 => 211173)
--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-01-25 23:37:26 UTC (rev 211173)
@@ -241,7 +241,7 @@
image->set(pixel++, maxAlpha);
}
-#if defined(_MSC_VER) && (_MSC_VER >= 1700)
+#if COMPILER(MSVC)
// Incorrectly diagnosing overwrite of stack in |totals| due to |preserveAlphaValues|.
#pragma warning(push)
#pragma warning(disable: 4789)
@@ -385,7 +385,7 @@
}
}
-#if defined(_MSC_VER) && (_MSC_VER >= 1700)
+#if COMPILER(MSVC)
#pragma warning(pop) // Disable of 4789
#endif
