Changeset 30108 in webkit

Timestamp:

Feb 9, 2008, 12:13:39 AM (17 years ago)

Author:

kevino@webkit.org

Message:

MSVC7 fixes.
​http://bugs.webkit.org/show_bug.cgi?id=17211

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Threading.h (modified) (1 diff)
• platform/win/SharedTimerWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-07  Kevin Ollivier <kevino@theolliviers.com>
+
+        Reviewed by Eric Seidel, Adam Roben.
+
+        MSVC7 fixes.
+        http://bugs.webkit.org/show_bug.cgi?id=17211
+
+        * platform/Threading.h:
+        - On MSVC7, when the Interlocked* functions are used, the ref count gets out of sync.
+          (MSVC8 seems not to have this problem.) Use the old implementation which works correctly.
+        * platform/win/SharedTimerWin.cpp:
+        - USER_TIMER_MINIMUM/MAXIMUM aren't defined in winuser.h for the MSVC 2003 Platform SDK
+          so define them if they are not already defined.
+
 2008-02-08  Brent Fulgham  <bfulgham@gmail.com>
 

trunk/WebCore/platform/Threading.h

@@ -161 +161 @@
 };
 
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) && !COMPILER(MSVC7)
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 

trunk/WebCore/platform/win/SharedTimerWin.cpp

@@ -40 +40 @@
 
 #include <windows.h>
+
+// These aren't in winuser.h with the MSVS 2003 Platform SDK, 
+// so use default values in that case.
+#ifndef USER_TIMER_MINIMUM
+#define USER_TIMER_MINIMUM 0x0000000A
+#endif
+
+#ifndef USER_TIMER_MAXIMUM
+#define USER_TIMER_MAXIMUM 0x7FFFFFFF
+#endif
 
 #if PLATFORM(WIN)