Skip to content

P
protobuf
Commit 25b2a673 authored by xiaofeng@google.com's avatar xiaofeng@google.com
Browse files
Options

Fix issue 474

parent 7f4c9e86
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/google/protobuf/stubs/atomicops.h
View file @ 25b2a673
...@@ -66,7 +66,7 @@ typedef int32 Atomic32; ...@@ -66,7 +66,7 @@ typedef int32 Atomic32;
#ifdef GOOGLE_PROTOBUF_ARCH_64_BIT #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT
// We need to be able to go between Atomic64 and AtomicWord implicitly. This // 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. // 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! // NaCl's intptr_t is not actually 64-bits on 64-bit!
// http://code.google.com/p/nativeclient/issues/detail?id=1162 // http://code.google.com/p/nativeclient/issues/detail?id=1162
typedef int64 Atomic64; typedef int64 Atomic64;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment