diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:54:27 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:54:27 +0200 |
| commit | f952f4a4ce4464beda012e1fe0cd4da9f91a23a8 (patch) | |
| tree | b613af97e2052e1db1689a0b004bacd9621800c1 /Source/JavaScriptCore/jit/JITStubs.h | |
| parent | 84bef97f5004ccc60dbba0faa4f4b8d40838ee23 (diff) | |
| parent | 55f814fc556631b390f0c5764bb4ee3ceeea1d45 (diff) | |
| download | qtwebkit-f952f4a4ce4464beda012e1fe0cd4da9f91a23a8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I98b8afb91dff72023dabf58f0b570cada8804cf2
Diffstat (limited to 'Source/JavaScriptCore/jit/JITStubs.h')
| -rw-r--r-- | Source/JavaScriptCore/jit/JITStubs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/jit/JITStubs.h b/Source/JavaScriptCore/jit/JITStubs.h index 51873507e..2659d6899 100644 --- a/Source/JavaScriptCore/jit/JITStubs.h +++ b/Source/JavaScriptCore/jit/JITStubs.h @@ -140,7 +140,7 @@ struct JITStackFrame { ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast<ReturnAddressPtr*>(this) - 1; } }; #elif CPU(X86) -#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #pragma pack(push) #pragma pack(4) #endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) |