diff options
| author |  Vijay Pai <vpai@google.com> | 2016-01-11 10:08:26 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-01-11 10:08:26 -0800 |
| commit | 6045681003bef90de4d58952474893cfb56741e4 (patch) | |
| tree | ff0e1b5150c7a27d88ea7eab82acc6d95bc30c0a /test/core/end2end/tests/cancel_before_invoke.c | |
| parent | 78268212bae4e745606108beeeff317af393e033 (diff) | |
| parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) | |
Merge branch 'master' into bbuf
Diffstat (limited to 'test/core/end2end/tests/cancel_before_invoke.c')
| -rw-r--r-- | test/core/end2end/tests/cancel_before_invoke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/tests/cancel_before_invoke.c b/test/core/end2end/tests/cancel_before_invoke.c index e827a95f48..7b432fe87e 100644 --- a/test/core/end2end/tests/cancel_before_invoke.c +++ b/test/core/end2end/tests/cancel_before_invoke.c @@ -45,7 +45,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, |