diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /src/core/support/murmur_hash.h | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'src/core/support/murmur_hash.h')
| -rw-r--r-- | src/core/support/murmur_hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/support/murmur_hash.h b/src/core/support/murmur_hash.h index 343fcb99f7..0bf04f731a 100644 --- a/src/core/support/murmur_hash.h +++ b/src/core/support/murmur_hash.h @@ -39,6 +39,6 @@ #include <stddef.h> /* compute the hash of key (length len) */ -gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed); +uint32_t gpr_murmur_hash3(const void *key, size_t len, uint32_t seed); #endif /* GRPC_INTERNAL_CORE_SUPPORT_MURMUR_HASH_H */ |