diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-05 13:44:12 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-05 13:44:12 -0700 |
| commit | e96c05b607598d4d4a0bbe913e8d1554eb81511b (patch) | |
| tree | 7995d362ec042e746e1a9692a132a17b1d3f0777 /include/grpc/impl/codegen/port_platform.h | |
| parent | b8a886754e17de546a1e9cec995ef473b9a6700a (diff) | |
| parent | a2e50c5b85b4c0d4d7a5f9624eb40856198ef508 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix_gprc
Diffstat (limited to 'include/grpc/impl/codegen/port_platform.h')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index d96bf0cf8e..f52c7512d3 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -155,7 +155,7 @@ #else /* _LP64 */ #define GPR_ARCH_32 1 #endif /* _LP64 */ -#define GPR_CPU_LINUX 1 +#define GPR_CPU_POSIX 1 #define GPR_GCC_SYNC 1 #define GPR_GCC_TLS 1 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1 @@ -167,7 +167,7 @@ #define GPR_POSIX_ENV 1 #define GPR_POSIX_FILE 1 #define GPR_POSIX_TMPFILE 1 -#define GPR_POSIX_LOG +#define GPR_ANDROID_LOG 1 #define GPR_POSIX_STRING 1 #define GPR_POSIX_SUBPROCESS 1 #define GPR_POSIX_SYNC 1 |