Merge pull request #5909 from vjpai/make_building_great_again

Fix some issues in building under certain configurations
pull/5660/head
Jan Tattermusch 9 years ago
commit cf8266532c
  1. 1
      src/core/iomgr/udp_server.c
  2. 9
      src/core/surface/init.c

@ -61,6 +61,7 @@
#include "src/core/iomgr/socket_utils_posix.h"
#include "src/core/iomgr/unix_sockets_posix.h"
#include "src/core/support/string.h"
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/sync.h>

@ -89,18 +89,21 @@ static void do_basic_init(void) {
}
static bool append_filter(grpc_channel_stack_builder *builder, void *arg) {
return grpc_channel_stack_builder_append_filter(builder, arg, NULL, NULL);
return grpc_channel_stack_builder_append_filter(
builder, (const grpc_channel_filter *)arg, NULL, NULL);
}
static bool prepend_filter(grpc_channel_stack_builder *builder, void *arg) {
return grpc_channel_stack_builder_prepend_filter(builder, arg, NULL, NULL);
return grpc_channel_stack_builder_prepend_filter(
builder, (const grpc_channel_filter *)arg, NULL, NULL);
}
static bool maybe_add_http_filter(grpc_channel_stack_builder *builder,
void *arg) {
grpc_transport *t = grpc_channel_stack_builder_get_transport(builder);
if (t && strstr(t->vtable->name, "http")) {
return grpc_channel_stack_builder_prepend_filter(builder, arg, NULL, NULL);
return grpc_channel_stack_builder_prepend_filter(
builder, (const grpc_channel_filter *)arg, NULL, NULL);
}
return true;
}

Loading…
Cancel
Save