Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (150133 => 150134)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-15 19:12:04 UTC (rev 150134)
@@ -1,3 +1,18 @@
+2013-05-15 Nico Weber <[email protected]>
+
+ WebKit doesn't support MSVS2003 any more, remove preprocessor checks for older versions.
+ https://bugs.webkit.org/show_bug.cgi?id=116157
+
+ Reviewed by Anders Carlsson.
+
+ Also remove a gcc3.2 workaround.
+
+ Merges parts of these two commits by the talented Nico Weber:
+ https://chromium.googlesource.com/chromium/blink/+/3677e2f47348daeff405a40b6f90fbdf0654c2f5
+ https://chromium.googlesource.com/chromium/blink/+/0fcd96c448dc30be1416dcc15713c53710c1a312
+
+ * os-win32/inttypes.h:
+
2013-05-13 Alvaro Lopez Ortega <[email protected]>
Nightly build's jsc doesn't work without DYLD_FRAMEWORK...
Modified: trunk/Source/_javascript_Core/os-win32/inttypes.h (150133 => 150134)
--- trunk/Source/_javascript_Core/os-win32/inttypes.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/_javascript_Core/os-win32/inttypes.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -38,11 +38,6 @@
#error "This inttypes.h file should only be compiled with MSVC"
#endif
-#ifdef WTF_COMPILER_MSVC7_OR_LOWER
-// https://bugs.webkit.org/show_bug.cgi?id=76210
-#error "Visual Studio 2005 or newer is required"
-#endif
-
#if _MSC_VER > 1000
#pragma once
#endif
Modified: trunk/Source/WTF/ChangeLog (150133 => 150134)
--- trunk/Source/WTF/ChangeLog 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/ChangeLog 2013-05-15 19:12:04 UTC (rev 150134)
@@ -1,3 +1,29 @@
+2013-05-15 Nico Weber <[email protected]>
+
+ WebKit doesn't support MSVS2003 any more, remove preprocessor checks for older versions.
+ https://bugs.webkit.org/show_bug.cgi?id=116157
+
+ Reviewed by Anders Carlsson.
+
+ Also remove a gcc3.2 workaround.
+
+ Merges parts of these two commits by the talented Nico Weber:
+ https://chromium.googlesource.com/chromium/blink/+/3677e2f47348daeff405a40b6f90fbdf0654c2f5
+ https://chromium.googlesource.com/chromium/blink/+/0fcd96c448dc30be1416dcc15713c53710c1a312
+
+ * wtf/Alignment.h:
+ (WTF):
+ * wtf/Assertions.h:
+ * wtf/Atomics.h:
+ (WTF):
+ * wtf/Compiler.h:
+ * wtf/DateMath.cpp:
+ (WTF::getLocalTime):
+ * wtf/MathExtras.h:
+ * wtf/RefCountedLeakCounter.h:
+ (RefCountedLeakCounter):
+ * wtf/StaticConstructors.h:
+
2013-05-15 Patrick Gansterer <[email protected]>
Consolidate lists in WTF CMake files
Modified: trunk/Source/WTF/wtf/Alignment.h (150133 => 150134)
--- trunk/Source/WTF/wtf/Alignment.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/Alignment.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -38,7 +38,7 @@
#error WTF_ALIGN macros need alignment control.
#endif
-#if COMPILER(GCC) && !COMPILER(INTEL) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 303)
+#if COMPILER(GCC) && !COMPILER(INTEL)
typedef char __attribute__((__may_alias__)) AlignedBufferChar;
#else
typedef char AlignedBufferChar;
Modified: trunk/Source/WTF/wtf/Assertions.h (150133 => 150134)
--- trunk/Source/WTF/wtf/Assertions.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/Assertions.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -34,12 +34,6 @@
For non-debug builds, everything is disabled by default.
Defining any of the symbols explicitly prevents this from having any effect.
-
- MSVC7 note: variadic macro support was added in MSVC8, so for now we disable
- those macros in MSVC7. For more info, see the MSDN document on variadic
- macros here:
-
- http://msdn2.microsoft.com/en-us/library/ms177415(VS.80).aspx
*/
#include <wtf/Platform.h>
@@ -57,12 +51,6 @@
#define ASSERTIONS_DISABLED_DEFAULT 0
#endif
-#if COMPILER(MSVC7_OR_LOWER)
-#define HAVE_VARIADIC_MACRO 0
-#else
-#define HAVE_VARIADIC_MACRO 1
-#endif
-
#ifndef BACKTRACE_DISABLED
#define BACKTRACE_DISABLED ASSERTIONS_DISABLED_DEFAULT
#endif
@@ -72,40 +60,24 @@
#endif
#ifndef ASSERT_MSG_DISABLED
-#if HAVE(VARIADIC_MACRO)
#define ASSERT_MSG_DISABLED ASSERTIONS_DISABLED_DEFAULT
-#else
-#define ASSERT_MSG_DISABLED 1
#endif
-#endif
#ifndef ASSERT_ARG_DISABLED
#define ASSERT_ARG_DISABLED ASSERTIONS_DISABLED_DEFAULT
#endif
#ifndef FATAL_DISABLED
-#if HAVE(VARIADIC_MACRO)
#define FATAL_DISABLED ASSERTIONS_DISABLED_DEFAULT
-#else
-#define FATAL_DISABLED 1
#endif
-#endif
#ifndef ERROR_DISABLED
-#if HAVE(VARIADIC_MACRO)
#define ERROR_DISABLED ASSERTIONS_DISABLED_DEFAULT
-#else
-#define ERROR_DISABLED 1
#endif
-#endif
#ifndef LOG_DISABLED
-#if HAVE(VARIADIC_MACRO)
#define LOG_DISABLED ASSERTIONS_DISABLED_DEFAULT
-#else
-#define LOG_DISABLED 1
#endif
-#endif
#if COMPILER(GCC)
#define WTF_PRETTY_FUNCTION __PRETTY_FUNCTION__
@@ -290,9 +262,7 @@
/* ASSERT_WITH_MESSAGE */
-#if COMPILER(MSVC7_OR_LOWER)
-#define ASSERT_WITH_MESSAGE(assertion) ((void)0)
-#elif ASSERT_MSG_DISABLED
+#if ASSERT_MSG_DISABLED
#define ASSERT_WITH_MESSAGE(assertion, ...) ((void)0)
#else
#define ASSERT_WITH_MESSAGE(assertion, ...) do \
@@ -305,9 +275,7 @@
/* ASSERT_WITH_MESSAGE_UNUSED */
-#if COMPILER(MSVC7_OR_LOWER)
-#define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion) ((void)0)
-#elif ASSERT_MSG_DISABLED
+#if ASSERT_MSG_DISABLED
#if COMPILER(INTEL) && !OS(WINDOWS) || COMPILER(RVCT)
template<typename T>
inline void assertWithMessageUnused(T& x) { (void)x; }
@@ -356,9 +324,7 @@
/* FATAL */
-#if COMPILER(MSVC7_OR_LOWER)
-#define FATAL() ((void)0)
-#elif FATAL_DISABLED
+#if FATAL_DISABLED
#define FATAL(...) ((void)0)
#else
#define FATAL(...) do { \
@@ -369,9 +335,7 @@
/* LOG_ERROR */
-#if COMPILER(MSVC7_OR_LOWER)
-#define LOG_ERROR() ((void)0)
-#elif ERROR_DISABLED
+#if ERROR_DISABLED
#define LOG_ERROR(...) ((void)0)
#else
#define LOG_ERROR(...) WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, __VA_ARGS__)
@@ -379,9 +343,7 @@
/* LOG */
-#if COMPILER(MSVC7_OR_LOWER)
-#define LOG() ((void)0)
-#elif LOG_DISABLED
+#if LOG_DISABLED
#define LOG(channel, ...) ((void)0)
#else
#define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
@@ -391,9 +353,7 @@
/* LOG_VERBOSE */
-#if COMPILER(MSVC7_OR_LOWER)
-#define LOG_VERBOSE(channel) ((void)0)
-#elif LOG_DISABLED
+#if LOG_DISABLED
#define LOG_VERBOSE(channel, ...) ((void)0)
#else
#define LOG_VERBOSE(channel, ...) WTFLogVerbose(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
Modified: trunk/Source/WTF/wtf/Atomics.h (150133 => 150134)
--- trunk/Source/WTF/wtf/Atomics.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/Atomics.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -82,7 +82,7 @@
#if OS(WINCE)
inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
-#elif COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER)
+#elif COMPILER(MINGW)
inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
Modified: trunk/Source/WTF/wtf/Compiler.h (150133 => 150134)
--- trunk/Source/WTF/wtf/Compiler.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/Compiler.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -73,13 +73,10 @@
#endif
/* COMPILER(MSVC) - Microsoft Visual C++ */
-/* COMPILER(MSVC7_OR_LOWER) - Microsoft Visual C++ 2003 or lower*/
/* COMPILER(MSVC9_OR_LOWER) - Microsoft Visual C++ 2008 or lower*/
#if defined(_MSC_VER)
#define WTF_COMPILER_MSVC 1
-#if _MSC_VER < 1400
-#define WTF_COMPILER_MSVC7_OR_LOWER 1
-#elif _MSC_VER < 1600
+#if _MSC_VER < 1600
#define WTF_COMPILER_MSVC9_OR_LOWER 1
#endif
Modified: trunk/Source/WTF/wtf/DateMath.cpp (150133 => 150134)
--- trunk/Source/WTF/wtf/DateMath.cpp 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2013-05-15 19:12:04 UTC (rev 150134)
@@ -135,7 +135,7 @@
#if !OS(WINCE)
static inline void getLocalTime(const time_t* localTime, struct tm* localTM)
{
-#if COMPILER(MSVC7_OR_LOWER) || COMPILER(MINGW)
+#if COMPILER(MINGW)
*localTM = *localtime(localTime);
#elif COMPILER(MSVC)
localtime_s(localTM, localTime);
Modified: trunk/Source/WTF/wtf/RefCountedLeakCounter.h (150133 => 150134)
--- trunk/Source/WTF/wtf/RefCountedLeakCounter.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/RefCountedLeakCounter.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -38,7 +38,7 @@
#ifndef NDEBUG
private:
-#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
+#if COMPILER(MINGW) || OS(WINCE)
int m_count;
#else
volatile int m_count;
Modified: trunk/Source/WTF/wtf/StaticConstructors.h (150133 => 150134)
--- trunk/Source/WTF/wtf/StaticConstructors.h 2013-05-15 18:55:30 UTC (rev 150133)
+++ trunk/Source/WTF/wtf/StaticConstructors.h 2013-05-15 19:12:04 UTC (rev 150134)
@@ -51,24 +51,14 @@
#ifndef SKIP_STATIC_CONSTRUCTORS_ON_GCC
// Define an global in the normal way.
-#if COMPILER(MSVC7_OR_LOWER)
-#define DEFINE_GLOBAL(type, name) \
- const type name;
-#else
#define DEFINE_GLOBAL(type, name, ...) \
const type name;
-#endif
#else
// Define an correctly-sized array of pointers to avoid static initialization.
// Use an array of pointers instead of an array of char in case there is some alignment issue.
-#if COMPILER(MSVC7_OR_LOWER)
-#define DEFINE_GLOBAL(type, name) \
- void * name[(sizeof(type) + sizeof(void *) - 1) / sizeof(void *)];
-#else
#define DEFINE_GLOBAL(type, name, ...) \
void * name[(sizeof(type) + sizeof(void *) - 1) / sizeof(void *)];
#endif
-#endif
#endif // StaticConstructors_h
