diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-20 13:55:35 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-20 13:55:35 -0800 |
| commit | ff1f160a264b92122e07b655ef1879693202b581 (patch) | |
| tree | 3d0572dea8165af9eaae7581b9ba4e6305851136 /src/core/lib/transport/timeout_encoding.h | |
| parent | a66243d38e986df75fc6d9c6420267bda587dc04 (diff) | |
| parent | 28ec869b5a2567cd30a6e3bcc0efbee0ab0ae7f5 (diff) | |
Merge github.com:grpc/grpc into bwest
Diffstat (limited to 'src/core/lib/transport/timeout_encoding.h')
| -rw-r--r-- | src/core/lib/transport/timeout_encoding.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 92f02f6ecd..4c8025d800 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -34,7 +34,9 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H #define GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H +#include <grpc/slice.h> #include <grpc/support/time.h> + #include "src/core/lib/support/string.h" #define GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE (GPR_LTOA_MIN_BUFSIZE + 1) @@ -42,6 +44,6 @@ /* Encode/decode timeouts to the GRPC over HTTP/2 format; encoding may round up arbitrarily */ void grpc_http2_encode_timeout(gpr_timespec timeout, char *buffer); -int grpc_http2_decode_timeout(const char *buffer, gpr_timespec *timeout); +int grpc_http2_decode_timeout(grpc_slice text, gpr_timespec *timeout); #endif /* GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H */ |