diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-26 13:58:52 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-26 13:58:52 -0800 |
| commit | 48af8b2721c2819eebdaad41872b694377d33876 (patch) | |
| tree | 47e2b5dc98227bae141baa5be6b5796087e560be /src/core/lib/transport/timeout_encoding.h | |
| parent | eb757d24e24149e0d4aacb98e13c58c7ff84f5b6 (diff) | |
| parent | 1291fd4b2f9f502f412c3d6cd5dd5fdc18092842 (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, 1 insertions, 3 deletions
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 4c8025d800..92f02f6ecd 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -34,9 +34,7 @@ #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) @@ -44,6 +42,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(grpc_slice text, gpr_timespec *timeout); +int grpc_http2_decode_timeout(const char *buffer, gpr_timespec *timeout); #endif /* GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H */ |