diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:41:16 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:41:16 -0700 |
| commit | dc6d5a6244232555c2d3392d51c65d11b3f447e8 (patch) | |
| tree | aa14e41ce3168b64af9805ac165d611df05ab7fe /test/core | |
| parent | 8090150911d508d3b861f25d124b7b48462ad8d2 (diff) | |
| parent | 38da4491cc85710ff2870f980cc4389b1fc0ffb0 (diff) | |
Merge pull request #5829 from jtattermusch/fix_openssl_deadlink
Fix gcc4.4 tests
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/end2end/fixtures/h2_uchannel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_uchannel.c b/test/core/end2end/fixtures/h2_uchannel.c index 87bbd64d09..0795ef18e7 100644 --- a/test/core/end2end/fixtures/h2_uchannel.c +++ b/test/core/end2end/fixtures/h2_uchannel.c @@ -285,7 +285,7 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { micro_fullstack_fixture_data *ffd = f->fixture_data; grpc_connectivity_state conn_state; - grpc_connected_subchannel *connected; + grpc_connected_subchannel *connected_subchannel; char *ipv4_localaddr; gpr_asprintf(&ipv4_localaddr, "ipv4:%s", ffd->localaddr); @@ -302,9 +302,10 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, GPR_ASSERT(conn_state == GRPC_CHANNEL_IDLE); GPR_ASSERT(ffd->sniffed_subchannel != NULL); - connected = connect_subchannel(ffd->sniffed_subchannel); + connected_subchannel = connect_subchannel(ffd->sniffed_subchannel); f->client = grpc_client_uchannel_create(ffd->sniffed_subchannel, client_args); - grpc_client_uchannel_set_connected_subchannel(f->client, connected); + grpc_client_uchannel_set_connected_subchannel(f->client, + connected_subchannel); gpr_log(GPR_INFO, "CHANNEL WRAPPING SUBCHANNEL: %p(%p)", f->client, ffd->sniffed_subchannel); |