From 282501f5a03ec42ceb15e6e56d4580393bdf2095 Mon Sep 17 00:00:00 2001 From: "vapier@chromium.org" Date: Wed, 27 Mar 2013 22:57:46 +0000 Subject: fix x32 handling of Atomic64 The x32 logic for the size of Atomic64 handles NaCL, but misses the Linux case. Check the standard __ILP32__ to handle that too. Upstream tracker: https://code.google.com/p/protobuf/issues/detail?id=474 BUG=chromium-os:36866 TEST=compiled the code for x86_64 (64bit) & x86_64 (x32) R=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/12380082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191058 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/protobuf/src/google/protobuf/stubs/atomicops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party') diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops.h index 1315682..89045cd 100644 --- a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h +++ b/third_party/protobuf/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; -- cgit v1.1