diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-27 10:09:00 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-27 10:09:00 +1000 |
| commit | 1efae63bf7cba55526c91dcff3139d0a10885efc (patch) | |
| tree | d07e1a5db7b2726bbc5d941da3ed97097820b8ca /src/corelib/thread/qbasicatomic.h | |
| parent | 249bb31dc9fa12acff44ebf0effbdaedc43b5305 (diff) | |
| parent | 41f1276392444b9e46b30f3537a8a63af6fffc9d (diff) | |
| download | qt4-tools-1efae63bf7cba55526c91dcff3139d0a10885efc.tar.gz | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 7b86ee078e..5017dbdd9b 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -137,7 +137,12 @@ public: #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; |