diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
| commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
| tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/3rdparty/masm/assembler | |
| parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
| parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/3rdparty/masm/assembler')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h index f03254aa38..e3c77d99e6 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h @@ -66,7 +66,7 @@ #define CALLING_CONVENTION_IS_STDCALL 0 #endif -#if CPU(X86) +#if CPU(X86) && !OS(INTEGRITY) #define HAS_FASTCALL_CALLING_CONVENTION 1 #ifndef FASTCALL #if COMPILER(MSVC) |