diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-22 17:36:44 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-22 17:36:44 -0700 |
| commit | f00badd7309ca8a599acb11b1fe428b3d08262d5 (patch) | |
| tree | 08cdde57d1420e3693febfdad23bb9d27c300f8b | |
| parent | c0df4e1dda640df5ad6404250bb8ff60f9c202e7 (diff) | |
| parent | 8a6c8258842c30c4185e1c57b2309daf3d14396e (diff) | |
Merge pull request #8171 from perumaalgoog/perugrpc2
Fix Android + CPP build
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 4 | ||||
| -rw-r--r-- | src/core/lib/support/log_posix.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index f97e386289..4e9be4d018 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 diff --git a/src/core/lib/support/log_posix.c b/src/core/lib/support/log_posix.c index 6ae6320767..f972da0887 100644 --- a/src/core/lib/support/log_posix.c +++ b/src/core/lib/support/log_posix.c @@ -33,7 +33,7 @@ #include <grpc/support/port_platform.h> -#if defined(GPR_POSIX_LOG) +#ifdef GPR_POSIX_LOG #include <grpc/support/alloc.h> #include <grpc/support/log.h> |