diff options
author | David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
commit | 8a187099ec8accf4f4b9c1bcea0a71d023f6389b (patch) | |
tree | ae197d56afaf80aff6a1cb6dba715dba665572bf /src/core/transport/chttp2/status_conversion.h | |
parent | d7d9ce27c523798384051246e18e3f00b29dd8c9 (diff) | |
parent | f8c63562c1388262c5588e381c05cb0c02e5b406 (diff) |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
Diffstat (limited to 'src/core/transport/chttp2/status_conversion.h')
-rw-r--r-- | src/core/transport/chttp2/status_conversion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/status_conversion.h b/src/core/transport/chttp2/status_conversion.h index cf06c3576e..0ec5b560b8 100644 --- a/src/core/transport/chttp2/status_conversion.h +++ b/src/core/transport/chttp2/status_conversion.h @@ -47,4 +47,4 @@ grpc_status_code grpc_chttp2_http2_error_to_grpc_status( grpc_status_code grpc_chttp2_http2_status_to_grpc_status(int status); int grpc_chttp2_grpc_status_to_http2_status(grpc_status_code status); -#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STATUS_CONVERSION_H */ +#endif /* GRPC_INTERNAL_CORE_TRANSPORT_CHTTP2_STATUS_CONVERSION_H */ |