[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 15:05:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f12bafdd20eb2406de6bdeeff1d834a8302c15e8
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 27 21:33:58 2010 +0000
Windows build fix.
* jit/JITStubs.cpp:
(JSC::jitThrow):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70711 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index dfe4b1d..24227e2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-27 Brian Weinstein <bweinstein at apple.com>
+
+ Windows build fix.
+
+ * jit/JITStubs.cpp:
+ (JSC::jitThrow):
+
2010-10-27 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index 50d84c6..e5cf503 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -1078,7 +1078,8 @@ static ExceptionHandler jitThrow(JSGlobalData* globalData, CallFrame* callFrame,
void* catchRoutine = handler ? handler->nativeCode.executableAddress() : FunctionPtr(ctiOpThrowNotCaught).value();
ASSERT(catchRoutine);
- return (ExceptionHandler){ catchRoutine, callFrame };
+ ExceptionHandler exceptionHandler = { catchRoutine, callFrame };
+ return exceptionHandler;
}
#if CPU(ARM_THUMB2)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list