Index: boost/atomic.hpp
===================================================================
--- boost/atomic.hpp	(revision 80334)
+++ boost/atomic.hpp	(working copy)
@@ -12,6 +12,7 @@
 
 #include <boost/memory_order.hpp>
 
+#include <boost/atomic/config.hpp>
 #include <boost/atomic/platform.hpp>
 #include <boost/atomic/detail/type-classifier.hpp>
 #include <boost/type_traits/is_signed.hpp>
@@ -114,8 +115,8 @@
 typedef atomic<uint64_t> atomic_uint64_t;
 typedef atomic<int64_t> atomic_int64_t;
 #ifdef BOOST_HAS_LONG_LONG
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<long long> atomic_llong;
+typedef atomic<boost::ulong_long_type> atomic_ullong;
+typedef atomic<boost::long_long_type> atomic_llong;
 #endif
 typedef atomic<void*> atomic_address;
 typedef atomic<bool> atomic_bool;
@@ -161,8 +162,10 @@
 typedef atomic<long> atomic_long;
 typedef atomic<uint64_t> atomic_uint64_t;
 typedef atomic<int64_t> atomic_int64_t;
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<long long> atomic_llong;
+#ifdef BOOST_HAS_LONG_LONG
+typedef atomic<boost::ulong_long_type> atomic_ullong;
+typedef atomic<boost::long_long_type> atomic_llong;
+#endif
 typedef atomic<void*> atomic_address;
 typedef atomic<bool> atomic_bool;