diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-12-17 10:37:10 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-12-17 18:54:58 -0800 |
| commit | 1b34aeb554a5c825fb5839139186a679589526f4 (patch) | |
| tree | 09dd06ffae56494926e4d369087dc80d98e84dde | |
| parent | 0cde8d45093ec07ac80cecbfa37b096312acbc1d (diff) | |
fixing x64 build with vs2015
| -rw-r--r-- | src/core/security/credentials.c | 4 | ||||
| -rw-r--r-- | src/core/surface/init.c | 4 | ||||
| -rw-r--r-- | test/core/support/alloc_test.c | 4 | ||||
| -rw-r--r-- | test/core/transport/connectivity_state_test.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index a0054741ad..3013fac465 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -179,8 +179,8 @@ void grpc_server_credentials_set_auth_metadata_processor( GRPC_API_TRACE( "grpc_server_credentials_set_auth_metadata_processor(" "creds=%p, " - "processor=grpc_auth_metadata_processor { process: %lx, state: %p })", - 3, (creds, (unsigned long)processor.process, processor.state)); + "processor=grpc_auth_metadata_processor { process: %p, state: %p })", + 3, (creds, (void*)(gpr_intptr)processor.process, processor.state)); if (creds == NULL) return; if (creds->processor.destroy != NULL && creds->processor.state != NULL) { creds->processor.destroy(creds->processor.state); diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 82027af651..81166e8ec5 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -82,8 +82,8 @@ static grpc_plugin g_all_of_the_plugins[MAX_PLUGINS]; static int g_number_of_plugins = 0; void grpc_register_plugin(void (*init)(void), void (*destroy)(void)) { - GRPC_API_TRACE("grpc_register_plugin(init=%lx, destroy=%lx)", 2, - ((unsigned long)init, (unsigned long)destroy)); + GRPC_API_TRACE("grpc_register_plugin(init=%p, destroy=%p)", 2, + ((void*)(gpr_intptr)init, (void*)(gpr_intptr)destroy)); GPR_ASSERT(g_number_of_plugins != MAX_PLUGINS); g_all_of_the_plugins[g_number_of_plugins].init = init; g_all_of_the_plugins[g_number_of_plugins].destroy = destroy; 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; |