Index: src/google/protobuf/stubs/atomicops.h
===================================================================
--- src/google/protobuf/stubs/atomicops.h       (revision 423)
+++ src/google/protobuf/stubs/atomicops.h       (working copy)
@@ -69,9 +69,9 @@
 #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 intptr_t Atomic64;
+#else
 typedef int64 Atomic64;
-#else
-typedef intptr_t Atomic64;
 #endif
 #endif

-- 
You received this message because you are subscribed to the Google Groups 
"Protocol Buffers" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/protobuf/-/2mk8pVR9_nUJ.
To post to this group, send email to protobuf@googlegroups.com.
To unsubscribe from this group, send email to 
protobuf+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/protobuf?hl=en.

Reply via email to