summaryrefslogtreecommitdiff
path: root/src/3rdparty/javascriptcore
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2010-04-07 18:28:34 +0200
committerKent Hansen <kent.hansen@nokia.com>2010-04-07 18:55:20 +0200
commit15afc83b1e786deda8c43aad50a62d33e49bed5b (patch)
tree480ee2505bd1a98bce26fc83441d0c7e156bb229 /src/3rdparty/javascriptcore
parent3be9c2c6dc2d67114e5a6ae5e87df47791d3f65f (diff)
downloadqt4-tools-15afc83b1e786deda8c43aad50a62d33e49bed5b.tar.gz
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( d4f1bc6ca356cc64e8991533ee293b4a0b196a3a )
Build fix for SPARC. Fix missing macro value.
Diffstat (limited to 'src/3rdparty/javascriptcore')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog8
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h2
-rw-r--r--src/3rdparty/javascriptcore/VERSION2
3 files changed, 10 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
index 508b39b5dd..36944ddac5 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-17 Mike Homey <glandium@debian.org>
+
+ Reviewed by Gustavo Noronha.
+
+ Build fix for SPARC. Fix missing macro value.
+
+ * wtf/Platform.h:
+
2010-03-03 Mark Rowe <mrowe@apple.com>
Reviewed by Geoff Garen.
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index b0a996f5ef..b3e3dbae34 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -176,7 +176,7 @@
/* CPU(SPARC) - any SPARC, true for CPU(SPARC32) and CPU(SPARC64) */
#if CPU(SPARC32) || CPU(SPARC64)
-#define WTF_CPU_SPARC
+#define WTF_CPU_SPARC 1
#endif
/* CPU(X86) - i386 / x86 32-bit */
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION
index a4136cad9f..1a07b25af5 100644
--- a/src/3rdparty/javascriptcore/VERSION
+++ b/src/3rdparty/javascriptcore/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
and has the sha1 checksum
- f62e6e4f8e3b3a966543f93ad1cb9030ac2988e6
+ d4f1bc6ca356cc64e8991533ee293b4a0b196a3a