From c2fccced314dbbafdda965602a71f1ef13c749d2 Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Fri, 4 Sep 2009 18:01:43 +0200
Subject: make JavaScriptCore compile on HPUX

Get rid of circular dependency (don't include StructureChain.h from Structure.h).
Disable some time stuff that isn't available on HPUX.

Reviewed-by: Simon Hausmann
---
 src/3rdparty/webkit/JavaScriptCore/bytecode/Instruction.h      | 1 +
 src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h    | 1 +
 src/3rdparty/webkit/JavaScriptCore/runtime/PropertyNameArray.h | 1 +
 src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h         | 2 +-
 src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.cpp  | 6 ++++++
 src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.h    | 2 +-
 src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h              | 2 +-
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/Instruction.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/Instruction.h
index eeeac6f4c3..594c4ddd8f 100644
--- a/src/3rdparty/webkit/JavaScriptCore/bytecode/Instruction.h
+++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/Instruction.h
@@ -32,6 +32,7 @@
 #include "MacroAssembler.h"
 #include "Opcode.h"
 #include "Structure.h"
+#include "StructureChain.h"
 #include <wtf/VectorTraits.h>
 
 #define POLYMORPHIC_LIST_CACHE_SIZE 8
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
index dc11feeac6..98e9b68ed1 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
@@ -27,6 +27,7 @@
 #include "NativeFunctionWrapper.h"
 #include "NumberPrototype.h"
 #include "StringPrototype.h"
+#include "StructureChain.h"
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/PropertyNameArray.h b/src/3rdparty/webkit/JavaScriptCore/runtime/PropertyNameArray.h
index b4382f4228..67ee9c89c3 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/PropertyNameArray.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/PropertyNameArray.h
@@ -24,6 +24,7 @@
 #include "CallFrame.h"
 #include "Identifier.h"
 #include "Structure.h"
+#include "StructureChain.h"
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h
index 0de03a33b0..dcd4e500e0 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h
@@ -30,7 +30,6 @@
 #include "JSType.h"
 #include "JSValue.h"
 #include "PropertyMapHashTable.h"
-#include "StructureChain.h"
 #include "StructureTransitionTable.h"
 #include "TypeInfo.h"
 #include "UString.h"
@@ -47,6 +46,7 @@ namespace JSC {
 
     class PropertyNameArray;
     class PropertyNameArrayData;
+    class StructureChain;
 
     class Structure : public RefCounted<Structure> {
     public:
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.cpp
index 85049b1ed8..acebc8605e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.cpp
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "StructureChain.h"
+#include "Structure.h"
 
 #include "JSObject.h"
 #include "Structure.h"
@@ -46,6 +47,11 @@ StructureChain::StructureChain(Structure* head)
     m_vector[i] = 0;
 }
 
+PassRefPtr<StructureChain> StructureChain::create(Structure* head)
+{
+    return adoptRef(new StructureChain(head));
+}
+
 bool StructureChain::isCacheable() const
 {
     uint32_t i = 0;
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.h b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.h
index c48749d29b..5990e17d4d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureChain.h
@@ -37,7 +37,7 @@ namespace JSC {
 
     class StructureChain : public RefCounted<StructureChain> {
     public:
-        static PassRefPtr<StructureChain> create(Structure* head) { return adoptRef(new StructureChain(head)); }
+        static PassRefPtr<StructureChain> create(Structure* head);
         RefPtr<Structure>* head() { return m_vector.get(); }
         bool isCacheable() const;
 
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index e1e4ba3c22..fa37d55daa 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -501,7 +501,7 @@
 #endif
 
 #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \
-    && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(AIX)
+    && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(AIX) && !PLATFORM(HPUX)
 #define HAVE_TM_GMTOFF 1
 #define HAVE_TM_ZONE 1
 #define HAVE_TIMEGM 1
-- 
cgit v1.2.3