diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 13:23:58 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 13:23:58 -0700 |
| commit | 5c28096ce3b6e5fe0564d836ba69347f5f97dc02 (patch) | |
| tree | 5dff5f1b8477b2f5f786bcb02a9ec552f9358d55 | |
| parent | 8b7678cf846cc5b51cd4fc459c7a8d7a2aaebc01 (diff) | |
Fix merge problems.
| -rw-r--r-- | src/core/ext/client_config/http_connect_handshaker.c | 6 | ||||
| -rw-r--r-- | src/core/ext/resolver/dns/native/dns_resolver.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/client_config/http_connect_handshaker.c b/src/core/ext/client_config/http_connect_handshaker.c index b6d71e2a81..fda1df173e 100644 --- a/src/core/ext/client_config/http_connect_handshaker.c +++ b/src/core/ext/client_config/http_connect_handshaker.c @@ -35,9 +35,9 @@ #include <string.h> -#include <grpc/impl/codegen/alloc.h> -#include <grpc/impl/codegen/log.h> -#include <grpc/impl/codegen/slice_buffer.h> +#include <grpc/support/alloc.h> +#include <grpc/support/log.h> +#include <grpc/support/slice_buffer.h> #include <grpc/support/string_util.h> #include "src/core/ext/client_config/uri_parser.h" diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c index a5697d6a2c..759bd4a699 100644 --- a/src/core/ext/resolver/dns/native/dns_resolver.c +++ b/src/core/ext/resolver/dns/native/dns_resolver.c @@ -190,6 +190,7 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, lb_policy = grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args); gpr_free(lb_policy_args.addresses); + result = grpc_resolver_result_create(); if (lb_policy != NULL) { grpc_resolver_result_set_lb_policy(result, lb_policy); GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "construction"); |