commit 8f0f014479ed6d69c8a39613a4598ea9e75c1f2f
author Nicolas Noble <nicolasnoble@users.noreply.github.com> Thu Sep 22 17:52:14 2016 -0700
committer GitHub <noreply@github.com> Thu Sep 22 17:52:14 2016 -0700
tree a1366ab42857338eb0e16925d54fa11366828eb8
parent f00badd7309ca8a599acb11b1fe428b3d08262d5
parent 0d8b306785422fb625b9a8eae2b89a3effd10e9b

Merge pull request #8180 from f33rx/patch-1

Update .gitmodules

include/grpc/impl/codegen/port_platform.h

diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index f97e386..4e9be4d 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

src/core/lib/support/log_posix.c

diff --git a/src/core/lib/support/log_posix.c b/src/core/lib/support/log_posix.c
index 6ae6320..f972da0 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>