diff options
author | Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
---|---|---|
committer | Alistair Veitch <aveitch@google.com> | 2016-01-12 17:38:33 -0800 |
commit | f190601e606fb89158f671bea1676e4083bc9bb4 (patch) | |
tree | 10fa432bd7c2b794443beb882eb04c6b6b193b84 /test/core/end2end/tests/trailing_metadata.c | |
parent | bb30d2591fc52c5bacc309c107077d92d5afc70a (diff) | |
parent | 69ff3d3373e985ba7deba11bd854e95623af9b54 (diff) |
Merge branch 'master' into tag_set
Diffstat (limited to 'test/core/end2end/tests/trailing_metadata.c')
-rw-r--r-- | test/core/end2end/tests/trailing_metadata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/tests/trailing_metadata.c b/test/core/end2end/tests/trailing_metadata.c index 31182bc68d..78525e9538 100644 --- a/test/core/end2end/tests/trailing_metadata.c +++ b/test/core/end2end/tests/trailing_metadata.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, |