third_party/protobuf should build on the x86_64 architecture

third_party/protobuf/src/google/protobuf/stubs/atomicops.h

Index: third_party/protobuf/src/google/protobuf/stubs/atomicops.h
diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops.h
index 13156820950512d7896c0874567de6c8189a35be..fa65de91006fab50f529b8e52a68729f40652b63 100644
--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h
+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops.h
@@ -64,15 +64,7 @@ namespace internal {
 
 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)
-// 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;
-#else
-typedef intptr_t Atomic64;

[Mark Mentovai, 2012/08/21 15:22:04]

You are changing this for all platforms, but I think your patch aims to only be
scoped to Mac.

-#endif
 #endif
 
 // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or