From 8ebc15eb2768fab8a9e746785e0c67efb4ace02b Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 25 Nov 2009 15:19:13 +0100
Subject: 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
---
 src/corelib/thread/qbasicatomic.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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;
-- 
cgit v0.12