Fix issue 474
This commit is contained in:
parent
7f4c9e860e
commit
25b2a673ae
1 changed files with 1 additions and 1 deletions
|
@ -66,7 +66,7 @@ typedef int32 Atomic32;
|
|||
#ifdef GOOGLE_PROTOBUF_ARCH_64_BIT
|
||||
// We need to be able to go between Atomic64 and AtomicWord implicitly. This
|
||||
// means Atomic64 and AtomicWord should be the same type on 64-bit.
|
||||
#if defined(GOOGLE_PROTOBUF_OS_NACL)
|
||||
#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL)
|
||||
// NaCl's intptr_t is not actually 64-bits on 64-bit!
|
||||
// http://code.google.com/p/nativeclient/issues/detail?id=1162
|
||||
typedef int64 Atomic64;
|
||||
|
|
Loading…
Add table
Reference in a new issue