Skip to content
Snippets Groups Projects
Commit f00badd7 authored by Nicolas Noble's avatar Nicolas Noble Committed by GitHub
Browse files

Merge pull request #8171 from perumaalgoog/perugrpc2 

Fix Android + CPP build
parents c0df4e1d 8a6c8258
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/grpc/impl/codegen/port_platform.h
+ 2
− 2
View file @ f00badd7
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
#else /* _LP64 */ #else /* _LP64 */
#define GPR_ARCH_32 1 #define GPR_ARCH_32 1
#endif /* _LP64 */ #endif /* _LP64 */
#define GPR_CPU_LINUX 1 #define GPR_CPU_POSIX 1
#define GPR_GCC_SYNC 1 #define GPR_GCC_SYNC 1
#define GPR_GCC_TLS 1 #define GPR_GCC_TLS 1
#define GPR_POSIX_MULTIPOLL_WITH_POLL 1 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
#define GPR_POSIX_ENV 1 #define GPR_POSIX_ENV 1
#define GPR_POSIX_FILE 1 #define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1 #define GPR_POSIX_TMPFILE 1
#define GPR_POSIX_LOG #define GPR_ANDROID_LOG 1
#define GPR_POSIX_STRING 1 #define GPR_POSIX_STRING 1
#define GPR_POSIX_SUBPROCESS 1 #define GPR_POSIX_SUBPROCESS 1
#define GPR_POSIX_SYNC 1 #define GPR_POSIX_SYNC 1
......
src/core/lib/support/log_posix.c
+ 1
− 1
View file @ f00badd7
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#if defined(GPR_POSIX_LOG) #ifdef GPR_POSIX_LOG
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment