diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-11-14 13:38:10 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-11-14 13:38:10 +0000 |
| commit | a4491ea142c6b2b4e898f8110557c83008819476 (patch) | |
| tree | 0c5288d6918a2389eae7864b8b9a1b013fb9b073 /src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h | |
| parent | a058718f7abef4bc18e6a386023dbc0272037dc5 (diff) | |
Fix issue 412: update protobuf for 64-bit compatibility on Mac OS X - patch from Mark Mentovai
Diffstat (limited to 'src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h b/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h index 8d9a726c..e9d86797 100644 --- a/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h +++ b/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h @@ -44,7 +44,7 @@ // On LP64 platforms, AtomicWord and Atomic64 are both always long, // so this problem doesn't occur. -#if !defined(GOOGLE_PROTOBUF_HOST_ARCH_64_BIT) +#if !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) namespace google { namespace protobuf { @@ -117,6 +117,6 @@ inline AtomicWord Release_Load(volatile const AtomicWord* ptr) { } // namespace protobuf } // namespace google -#endif // !defined(GOOGLE_PROTOBUF_HOST_ARCH_64_BIT) +#endif // !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) #endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ |