diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-02-17 14:09:00 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-02-20 06:20:06 +0000 |
| commit | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (patch) | |
| tree | 81a8e500fbf26cbdc0be2e003f28def441b3ef66 /src | |
| parent | 54b11268052dd2c481c326e3a8ba30ebdb44f0e4 (diff) | |
Remove __cdecl from Windows desktop atomics
winbase.h defines them without __cdecl, so we shouldn't add them
ourselves to our forward declaration. Doing so results in errors if the
user changed the default calling convention when compiling Qt:
qatomic_msvc.h(126): error C2373: '_InterlockedIncrement' : redefinition; different type modifiers
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\intrin.h(242) : see declaration of '_InterlockedIncrement'
Task-number: QTBUG-44028
Change-Id: I1a800c709d3543699131ffff13c3d09fe53ba28b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/arch/qatomic_msvc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index 85889662fc..fc4d5a466a 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -42,7 +42,7 @@ // use compiler intrinsics for all atomic functions # define QT_INTERLOCKED_PREFIX _ -# define QT_INTERLOCKED_PROTOTYPE __cdecl +# define QT_INTERLOCKED_PROTOTYPE # define QT_INTERLOCKED_DECLARE_PROTOTYPES # define QT_INTERLOCKED_INTRINSIC # define Q_ATOMIC_INT16_IS_SUPPORTED |