diff options
| author | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-03-05 03:19:15 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-03-05 03:19:15 +0000 |
| commit | 25b2a673ae041ae34b13c64de0c36dc274f7834e (patch) | |
| tree | 7f9b02c8afb81821190762e3eb5754a7d4b7d80a | |
| parent | 7f4c9e860ee675e29cb0e9dc019beb14af097056 (diff) | |
| download | protobuf-25b2a673ae041ae34b13c64de0c36dc274f7834e.tar.gz protobuf-25b2a673ae041ae34b13c64de0c36dc274f7834e.tar.bz2 protobuf-25b2a673ae041ae34b13c64de0c36dc274f7834e.zip | |
Fix issue 474
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index b8581fa2..8ece86b3 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -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; |