diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /test/core/end2end/tests/cancel_in_a_vacuum.c | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'test/core/end2end/tests/cancel_in_a_vacuum.c')
| -rw-r--r-- | test/core/end2end/tests/cancel_in_a_vacuum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 6435d22ee9..214ab2b9e8 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.c @@ -46,7 +46,7 @@ enum { TIMEOUT = 200000 }; -static void *tag(gpr_intptr t) { return (void *)t; } +static void *tag(intptr_t t) { return (void *)t; } static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, const char *test_name, @@ -120,7 +120,7 @@ static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, config.tear_down_data(&f); } -void grpc_end2end_tests(grpc_end2end_test_config config) { +void cancel_in_a_vacuum(grpc_end2end_test_config config) { unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); i++) { |