diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
| commit | f1c85b0e752ecc5894ddd766cdea162defc8b352 (patch) | |
| tree | d7c5b3d4b7ce419cea108f63b832eaf060f3b0cb /src/core/lib/security/util/b64.h | |
| parent | da29be5ecef07781ef2cfa743300f971df05af76 (diff) | |
| parent | 032ca47012f23aecc7c7bf7f1cc9d998145119d9 (diff) | |
Merge branch 'master' into node_electron_build
Diffstat (limited to 'src/core/lib/security/util/b64.h')
| -rw-r--r-- | src/core/lib/security/util/b64.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/security/util/b64.h b/src/core/lib/security/util/b64.h index 6908095287..6ea0b5365b 100644 --- a/src/core/lib/security/util/b64.h +++ b/src/core/lib/security/util/b64.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_SECURITY_UTIL_B64_H #define GRPC_CORE_LIB_SECURITY_UTIL_B64_H -#include <grpc/support/slice.h> +#include <grpc/slice.h> /* Encodes data using base64. It is the caller's responsability to free the returned char * using gpr_free. Returns NULL on NULL input. */ @@ -43,10 +43,10 @@ char *grpc_base64_encode(const void *data, size_t data_size, int url_safe, /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -gpr_slice grpc_base64_decode(const char *b64, int url_safe); +grpc_slice grpc_base64_decode(const char *b64, int url_safe); /* Same as above except that the length is provided by the caller. */ -gpr_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, - int url_safe); +grpc_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, + int url_safe); #endif /* GRPC_CORE_LIB_SECURITY_UTIL_B64_H */ |