aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-06-16 16:17:56 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-06-16 16:17:56 -0700
commitbc4c3e3a79bcc7351f5923f56294a4a3840488e4 (patch)
tree036f2504a5dfa89d915dfbb5ab0dab8e890e8fdd /include
parent0e81d5e98f4c682b3f17430ea9d63b1177827d08 (diff)
parent2a69beffaae1864bfe22759da742d65c1e044b1f (diff)
Merge github.com:grpc/grpc into error
Diffstat (limited to 'include')
-rw-r--r--include/grpc/impl/codegen/port_platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index 9640ab6008..b8aa199aa8 100644
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@@ -150,7 +150,11 @@
#elif defined(ANDROID) || defined(__ANDROID__)
#define GPR_PLATFORM_STRING "android"
#define GPR_ANDROID 1
+#ifdef _LP64
+#define GPR_ARCH_64 1
+#else /* _LP64 */
#define GPR_ARCH_32 1
+#endif /* _LP64 */
#define GPR_CPU_LINUX 1
#define GPR_GCC_SYNC 1
#define GPR_GCC_TLS 1