diff -r 56cd8111b7f7 -r 41300fa6a67c src/corelib/thread/qbasicatomic.h --- a/src/corelib/thread/qbasicatomic.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/corelib/thread/qbasicatomic.h Tue Feb 02 00:43:10 2010 +0200 @@ -137,7 +137,12 @@ #if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) union { T * volatile _q_value; - long volatile _q_value_integral; +# if !defined(Q_OS_WINCE) && !defined(__i386__) && !defined(_M_IX86) + qint64 +# else + long +# endif + volatile _q_value_integral; }; #else T * volatile _q_value;