diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-19 09:55:39 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-19 09:55:39 (GMT) |
| commit | 13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3 (patch) | |
| tree | 5ea7e83ea49be3e8f3339bbb25ba627b1077e431 /src | |
| parent | dac482f71679f2175c9379e442d69e3993ec7730 (diff) | |
| download | Qt-13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3.zip Qt-13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3.tar.gz Qt-13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3.tar.bz2 | |
build on Solaris
Work-around for "Error: A union member cannot have a user-defined
assignment operator."
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h | 7 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h | 7 |
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; |