diff options
| author |  yang-g <yangg@google.com> | 2015-12-02 13:23:33 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-12-02 13:23:33 -0800 |
| commit | d88e1d8f4e42764e17aa2bed3a85b39f68673c03 (patch) | |
| tree | 57cf6860d1c67257ccedc8b762f744e9e4df4a69 /src/core/transport/chttp2/hpack_parser.h | |
| parent | 768999d0a351e2fd0a691d6391ff767228135123 (diff) | |
| parent | 9fac2afdafe1355b02a355b06955b21d2a2cd004 (diff) | |
merge with head and resolve conflict
Diffstat (limited to 'src/core/transport/chttp2/hpack_parser.h')
| -rw-r--r-- | src/core/transport/chttp2/hpack_parser.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/transport/chttp2/hpack_parser.h b/src/core/transport/chttp2/hpack_parser.h index f56867016c..fb894b5735 100644 --- a/src/core/transport/chttp2/hpack_parser.h +++ b/src/core/transport/chttp2/hpack_parser.h @@ -95,8 +95,7 @@ struct grpc_chttp2_hpack_parser { grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p, - grpc_mdctx *mdctx); +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p); void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p); void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p); |