diff options
| author | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 00:32:49 +0000 |
|---|---|---|
| committer | vapier@chromium.org <vapier@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 00:32:49 +0000 |
| commit | c163248dfa72284c77323c3ef36777fc2166aef0 (patch) | |
| tree | 340cac941eccba7e0534dca035f00fe995b460a3 /base/atomicops.h | |
| parent | 28aaa72a03df96fa1934876b0efbbc7e6b4b38af (diff) | |
| download | chromium_src-c163248dfa72284c77323c3ef36777fc2166aef0.zip chromium_src-c163248dfa72284c77323c3ef36777fc2166aef0.tar.gz chromium_src-c163248dfa72284c77323c3ef36777fc2166aef0.tar.bz2 | |
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.
BUG=chromium-os:36866
TEST=compiled the code for x86_64 (64bit) & x86_64 (x32)
Review URL: https://chromiumcodereview.appspot.com/12186005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/atomicops.h')
| -rw-r--r-- | base/atomicops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/atomicops.h b/base/atomicops.h index 13fb7e4..27a8714 100644 --- a/base/atomicops.h +++ b/base/atomicops.h @@ -47,7 +47,7 @@ typedef int32 Atomic32; #ifdef ARCH_CPU_64_BITS // 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(OS_NACL) +#if defined(__ILP32__) || defined(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_t Atomic64; |