[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:27:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4aba867a9deb394144ad518ff2076b2c07057214
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 26 04:01:03 2010 +0000
2010-07-25 Patrick Gansterer <paroga at paroga.com>
Reviewed by Kent Tamura.
[WINCE] Buildfix for JSC in release mode
https://bugs.webkit.org/show_bug.cgi?id=42934
* jsc.cpp: Don't use __try on WinCE.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1bcdcde..88c9d97 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-25 Patrick Gansterer <paroga at paroga.com>
+
+ Reviewed by Kent Tamura.
+
+ [WINCE] Buildfix for JSC in release mode
+ https://bugs.webkit.org/show_bug.cgi?id=42934
+
+ * jsc.cpp: Don't use __try on WinCE.
+
2010-07-24 Patrick Gansterer <paroga at paroga.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp
index c91bcb3..03bc411 100644
--- a/JavaScriptCore/jsc.cpp
+++ b/JavaScriptCore/jsc.cpp
@@ -308,7 +308,7 @@ EncodedJSValue JSC_HOST_CALL functionQuit(ExecState* exec)
// be in a separate main function because the jscmain function requires object
// unwinding.
-#if COMPILER(MSVC) && !defined(_DEBUG)
+#if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
#define TRY __try {
#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list