summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h7
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h7
2 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
index f7117be..b77ea05 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
@@ -65,7 +65,12 @@ namespace JSC {
};
#endif
- union CallData {
+#if defined(QT_BUILD_SCRIPT_LIB) && defined(Q_OS_SOLARIS)
+ struct
+#else
+ union
+#endif
+ CallData {
struct {
#ifndef QT_BUILD_SCRIPT_LIB
NativeFunction function;
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
index af720bb..7418974 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
@@ -70,7 +70,12 @@ namespace JSC {
};
#endif
- union ConstructData {
+#if defined(QT_BUILD_SCRIPT_LIB) && defined(Q_OS_SOLARIS)
+ struct
+#else
+ union
+#endif
+ ConstructData {
struct {
#ifndef QT_BUILD_SCRIPT_LIB
NativeConstructor function;