diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-01-12 00:54:16 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2017-01-13 09:57:14 +0000 |
| commit | dcc2a07791243d0010d25f092da2d1747ae2f711 (patch) | |
| tree | 36d443bc4291feb1dadde9b7b252b67c18a16c7d /src/3rdparty/masm/assembler | |
| parent | 0820efecb48d241f46f13f72c688d809fab6b72d (diff) | |
Add initial support for INTEGRITY
Change-Id: I1b44263a700f6c48c3b7798b662b30b03f9a4dc4
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
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) |