--- src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h.orig 2010-06-09 00:43:51.000000000 +0000 +++ src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h 2010-06-09 00:54:52.000000000 +0000 @@ -196,14 +196,14 @@ #elif COMPILER(GCC) #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 -inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); } -inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; } +inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); } +inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; } #endif template class ThreadSafeShared : Noncopyable { public: - ThreadSafeShared(int initialRefCount = 1) + ThreadSafeShared(_Atomic_word initialRefCount = 1) : m_refCount(initialRefCount) { } @@ -246,7 +246,7 @@ } private: - int m_refCount; + _Atomic_word m_refCount; #if !USE(LOCKFREE_THREADSAFESHARED) mutable Mutex m_mutex; #endif