diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-09-23 14:35:49 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-09-23 14:35:49 -0700 |
| commit | 08b0fab4260ce533c71a3b62c49fbf6871a87c93 (patch) | |
| tree | 0fc432dfb3062f2963d43f9d52e8b9e30425a46e /include/grpc/impl/codegen/port_platform.h | |
| parent | 7871f736ce62e74559602f928b25bea7389f57fb (diff) | |
| parent | 942c264861dedd8020fc18d65933e8f4f57e3e46 (diff) | |
Merge branch 'master' into uv_core_transport
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 77c7af8f14..34df89700d 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -144,12 +144,12 @@ #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_ENV 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 |