From 4e40b1952695f0b1086ef7b88e8514bd18cf96bf Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 17 Feb 2015 14:09:00 -0800 Subject: 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) Reviewed-by: Marc Mutz --- src/corelib/arch/qatomic_msvc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3