[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
aroben at apple.com
aroben at apple.com
Mon Feb 21 00:12:13 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ea60719343229ff93dfafb221e6392475e4084cc
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 20:51:34 2011 +0000
Chromium build fix after r76967
* wtf/ThreadingPrimitives.h: Use OS(WINDOWS) instead of PLATFORM(WIN), to match other
similar macros in this file.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 2ff2338..d170ad9 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-28 Adam Roben <aroben at apple.com>
+
+ Chromium build fix after r76967
+
+ * wtf/ThreadingPrimitives.h: Use OS(WINDOWS) instead of PLATFORM(WIN), to match other
+ similar macros in this file.
+
2011-01-28 Michael Saboff <msaboff at apple.com>
Potentially Unsafe HashSet of RuntimeObject* in RootObject definition
diff --git a/Source/JavaScriptCore/wtf/ThreadingPrimitives.h b/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
index 7596e6d..831a99e 100644
--- a/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
+++ b/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
@@ -150,7 +150,7 @@ private:
PlatformCondition m_condition;
};
-#if PLATFORM(WIN)
+#if OS(WINDOWS)
// The absoluteTime is in seconds, starting on January 1, 1970. The time is assumed to use the same time zone as WTF::currentTime().
// Returns an interval in milliseconds suitable for passing to one of the Win32 wait functions (e.g., ::WaitForSingleObject).
DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime);
@@ -162,7 +162,7 @@ using WTF::Mutex;
using WTF::MutexLocker;
using WTF::ThreadCondition;
-#if PLATFORM(WIN)
+#if OS(WINDOWS)
using WTF::absoluteTimeToWaitTimeoutInterval;
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list