Merge branch 'master' of github.com:grpc/grpc into remove_peer_from_ssl_auth_context

2 files changed, 3 insertions, 3 deletions

diff --git a/test/core/support/alloc_test.c b/test/core/support/alloc_test.c
index b950f0ab49..dc0a2acfa5 100644
--- a/test/core/support/alloc_test.c
+++ b/test/core/support/alloc_test.c
@@ -48,8 +48,8 @@ static void test_custom_allocs() {
   gpr_allocation_functions fns = {fake_malloc, fake_realloc, fake_free};
 
   gpr_set_allocation_functions(fns);
-  GPR_ASSERT((void *)0xdeadbeef == gpr_malloc(0xdeadbeef));
-  GPR_ASSERT((void *)0xcafed00d == gpr_realloc(0, 0xcafed00d));
+  GPR_ASSERT((void*)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef));
+  GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(0, 0xcafed00d));
 
   gpr_free(&addr_to_free);
   GPR_ASSERT(addr_to_free == 0xdeadd00d);
diff --git a/test/core/transport/connectivity_state_test.c b/test/core/transport/connectivity_state_test.c
index 1f23221812..34ab45d260 100644
--- a/test/core/transport/connectivity_state_test.c
+++ b/test/core/transport/connectivity_state_test.c
@@ -39,7 +39,7 @@
 
 #include "test/core/util/test_config.h"
 
-#define THE_ARG ((void *)0xcafebabe)
+#define THE_ARG ((void *)(size_t)0xcafebabe)
 
 int g_counter;