[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
dbates at webkit.org
dbates at webkit.org
Fri Jan 21 14:55:53 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit d4871371abfc34558bd1412a4d1a0672b3104f54
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 4 23:17:18 2011 +0000
2011-01-04 Daniel Bates <dbates at rim.com>
Fix the Android build after changeset 74975 <http://trac.webkit.org/changeset/74975>
(https://bugs.webkit.org/show_bug.cgi?id=51855).
* wtf/ThreadingPthreads.cpp: Add include of PassOwnPtr.h.
(WTF::runThreadWithRegistration): Use -> instead of . to dereference pointer.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6c0cd75..4895d6c 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-04 Daniel Bates <dbates at rim.com>
+
+ Fix the Android build after changeset 74975 <http://trac.webkit.org/changeset/74975>
+ (https://bugs.webkit.org/show_bug.cgi?id=51855).
+
+ * wtf/ThreadingPthreads.cpp: Add include of PassOwnPtr.h.
+ (WTF::runThreadWithRegistration): Use -> instead of . to dereference pointer.
+
2011-01-04 Martin Robinson <mrobinson at igalia.com>
Try to fix the EFL build.
diff --git a/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp b/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp
index 8ff1d78..bd4690f 100644
--- a/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp
+++ b/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp
@@ -52,6 +52,7 @@
#include "JNIUtility.h"
#include "ThreadFunctionInvocation.h"
#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
#endif
namespace WTF {
@@ -145,7 +146,7 @@ static void* runThreadWithRegistration(void* arg)
JNIEnv* env;
void* ret = 0;
if (vm->AttachCurrentThread(&env, 0) == JNI_OK) {
- ret = invocation->function(invocation.data);
+ ret = invocation->function(invocation->data);
vm->DetachCurrentThread();
}
return ret;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list