[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:12:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9c3d4f94858afda0d2d850f11cb8ade57ec24a22
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 00:19:39 2010 +0000
Speculative Qt/Windows build fix.
* jit/JITStubs.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63378 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 38e31c0..db08196 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
2010-07-14 Gavin Barraclough <barraclough at apple.com>
+ Speculative Qt/Windows build fix.
+
+ * jit/JITStubs.h:
+
+2010-07-14 Gavin Barraclough <barraclough at apple.com>
+
Reviewed by Oliver Hunt.
https://bugs.webkit.org/show_bug.cgi?id=42280
diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index 93e1f7e..ba9e15f 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -230,7 +230,7 @@ namespace JSC {
#if CPU(X86) && COMPILER(MSVC)
#define JIT_STUB __fastcall
-#elif CPU(X86) && COMPILER(GCC)
+#elif CPU(X86) && COMPILER(GCC) && !OS(WINDOWS)
#define JIT_STUB __attribute__ ((fastcall))
#else
#define JIT_STUB
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list