[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
ggaren at apple.com
ggaren at apple.com
Thu Dec 3 13:23:56 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit da59ee777034f453b2a1ad2a76c0fb3ee33eca5f
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 30 22:35:18 2009 +0000
Windows build fix: update for object-to-pointer change.
Patch by Geoffrey Garen <ggaren at apple.com> on 2009-10-30
* runtime/DatePrototype.cpp:
(JSC::formatLocaleDate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50361 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8d9039c..2ae2948 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-30 Geoffrey Garen <ggaren at apple.com>
+
+ Windows build fix: update for object-to-pointer change.
+
+ * runtime/DatePrototype.cpp:
+ (JSC::formatLocaleDate):
+
2009-10-29 Geoffrey Garen <ggaren at apple.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptCore/runtime/DatePrototype.cpp b/JavaScriptCore/runtime/DatePrototype.cpp
index 91cdd46..3c96b10 100644
--- a/JavaScriptCore/runtime/DatePrototype.cpp
+++ b/JavaScriptCore/runtime/DatePrototype.cpp
@@ -257,7 +257,7 @@ static JSCell* formatLocaleDate(ExecState* exec, DateInstance* dateObject, doubl
const GregorianDateTime* gregorianDateTime = dateObject->gregorianDateTime(exec, outputIsUTC);
if (!gregorianDateTime)
return jsNontrivialString(exec, "Invalid Date");
- return formatLocaleDate(exec, gregorianDateTime, format);
+ return formatLocaleDate(exec, *gregorianDateTime, format);
}
#endif // !PLATFORM(MAC)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list