diff options
author | 2015-07-01 14:52:44 -0700 | |
---|---|---|
committer | 2015-07-01 14:52:44 -0700 | |
commit | 8a187099ec8accf4f4b9c1bcea0a71d023f6389b (patch) | |
tree | ae197d56afaf80aff6a1cb6dba715dba665572bf /src/core/transport/transport_impl.h | |
parent | d7d9ce27c523798384051246e18e3f00b29dd8c9 (diff) | |
parent | f8c63562c1388262c5588e381c05cb0c02e5b406 (diff) |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
Diffstat (limited to 'src/core/transport/transport_impl.h')
-rw-r--r-- | src/core/transport/transport_impl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/transport/transport_impl.h b/src/core/transport/transport_impl.h index 479e15338f..c51951b7a7 100644 --- a/src/core/transport/transport_impl.h +++ b/src/core/transport/transport_impl.h @@ -63,8 +63,7 @@ typedef struct grpc_transport_vtable { void (*close)(grpc_transport *self); /* implementation of grpc_transport_ping */ - void (*ping)(grpc_transport *self, void (*cb)(void *user_data), - void *user_data); + void (*ping)(grpc_transport *self, grpc_iomgr_closure *cb); /* implementation of grpc_transport_destroy */ void (*destroy)(grpc_transport *self); |