summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-11-25 14:19:13 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-11-25 14:24:36 (GMT)
commit8ebc15eb2768fab8a9e746785e0c67efb4ace02b (patch)
tree359aff73a530347b037054a56441a359ed0b6873
parentaf628d615a6e28a5c539bec818f0eb9792f05756 (diff)
downloadQt-8ebc15eb2768fab8a9e746785e0c67efb4ace02b.zip
Qt-8ebc15eb2768fab8a9e746785e0c67efb4ace02b.tar.gz
Qt-8ebc15eb2768fab8a9e746785e0c67efb4ace02b.tar.bz2
Compile for 64-bit Windows
The integral type should be a 64-bit integer, not long (which is only 32-bit even when building 64-bit). Reviewed-by: Prasanth Ullattil Task-number: QTBUG-6079
-rw-r--r--src/corelib/thread/qbasicatomic.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 7b86ee0..5017dbd 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;