[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
ggaren at apple.com
ggaren at apple.com
Tue Jan 5 23:47:58 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ad8cd6f405c028967db0c8de9ed615faa859f6e9
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 12 05:39:33 2009 +0000
Windows build fix: Use unsigned instead of uint32_t to avoid dependencies.
* wtf/StdLibExtras.h:
(WTF::bitCount):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f086229..9a1d10f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
2009-12-11 Geoffrey Garen <ggaren at apple.com>
+ Windows build fix: Use unsigned instead of uint32_t to avoid dependencies.
+
+ * wtf/StdLibExtras.h:
+ (WTF::bitCount):
+
+2009-12-11 Geoffrey Garen <ggaren at apple.com>
+
Reviewed by Sam Weinig.
Changed GC from mark-sweep to mark-allocate.
diff --git a/JavaScriptCore/wtf/StdLibExtras.h b/JavaScriptCore/wtf/StdLibExtras.h
index 376d8ca..09436ab 100644
--- a/JavaScriptCore/wtf/StdLibExtras.h
+++ b/JavaScriptCore/wtf/StdLibExtras.h
@@ -70,7 +70,7 @@ namespace WTF {
}
// Returns a count of the number of bits set in 'bits'.
- inline size_t bitCount(uint32_t bits)
+ inline size_t bitCount(unsigned bits)
{
bits = bits - ((bits >> 1) & 0x55555555);
bits = (bits & 0x33333333) + ((bits >> 2) & 0x33333333);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list