Compile fix

pull/1888/head
Craig Tiller 10 years ago
parent 14556ecf8c
commit b475655a7e
  1. 2
      src/core/iomgr/pollset_posix.c
  2. 8
      src/core/surface/channel.c
  3. 2
      src/core/surface/server.c

@ -303,7 +303,7 @@ static void basic_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) {
up_args->pollset = pollset; up_args->pollset = pollset;
up_args->fd = fd; up_args->fd = fd;
up_args->original_vtable = pollset->vtable; up_args->original_vtable = pollset->vtable;
up_args->promotion_closure.cb = unary_poll_do_promote; up_args->promotion_closure.cb = basic_do_promote;
up_args->promotion_closure.cb_arg = up_args; up_args->promotion_closure.cb_arg = up_args;
grpc_iomgr_add_callback(&up_args->promotion_closure); grpc_iomgr_add_callback(&up_args->promotion_closure);

@ -199,11 +199,11 @@ static void destroy_channel(void *p, int ok) {
} }
#ifdef GRPC_CHANNEL_REF_COUNT_DEBUG #ifdef GRPC_CHANNEL_REF_COUNT_DEBUG
void grpc_channel_internal_unref(grpc_channel *c, const char *reason) { void grpc_channel_internal_unref(grpc_channel *channel, const char *reason) {
gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", c, c->refs.count, gpr_log(GPR_DEBUG, "CHANNEL: unref %p %d -> %d [%s]", channel,
c->refs.count - 1, reason); channel->refs.count, channel->refs.count - 1, reason);
#else #else
void grpc_channel_internal_unref(grpc_channel *c) { void grpc_channel_internal_unref(grpc_channel *channel) {
#endif #endif
if (gpr_unref(&channel->refs)) { if (gpr_unref(&channel->refs)) {
channel->destroy_closure.cb = destroy_channel; channel->destroy_closure.cb = destroy_channel;

@ -590,7 +590,7 @@ static void finish_shutdown_channel(void *p, int success) {
gpr_free(sca); gpr_free(sca);
} }
static void shutdown_channel(channel_data *chand) { static void shutdown_channel(channel_data *chand, int send_goaway, int send_disconnect) {
shutdown_channel_args *sca; shutdown_channel_args *sca;
GRPC_CHANNEL_INTERNAL_REF(chand->channel, "shutdown"); GRPC_CHANNEL_INTERNAL_REF(chand->channel, "shutdown");
sca = gpr_malloc(sizeof(shutdown_channel_args)); sca = gpr_malloc(sizeof(shutdown_channel_args));

Loading…
Cancel
Save