diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-01-13 12:47:59 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-01-13 12:47:59 -0800 |
| commit | c5dcb6af749279089513bdfde9308b6fb917ed7a (patch) | |
| tree | 559ea8190a705343ad012b194c48c30b719ffa29 /src/core/support | |
| parent | ad0dcdc212220ac97cdc8a02afaf2adec9b76799 (diff) | |
| parent | dec1a71f91b1a65cf826f1f628fc6b6162728c5c (diff) | |
Merge github.com:google/grpc into mac
Diffstat (limited to 'src/core/support')
| -rw-r--r-- | src/core/support/alloc.c | 4 | ||||
| -rw-r--r-- | src/core/support/cpu.h | 2 | ||||
| -rw-r--r-- | src/core/support/murmur_hash.h | 2 | ||||
| -rw-r--r-- | src/core/support/thd_internal.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index 658408f334..ddf6789773 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -62,6 +62,4 @@ void *gpr_malloc_aligned(size_t size, size_t alignment) { return (void *)ret; } -void gpr_free_aligned(void *ptr) { - free(((void **)ptr)[-1]); -} +void gpr_free_aligned(void *ptr) { free(((void **)ptr)[-1]); } diff --git a/src/core/support/cpu.h b/src/core/support/cpu.h index 6ac0db35e5..2435ec0353 100644 --- a/src/core/support/cpu.h +++ b/src/core/support/cpu.h @@ -46,4 +46,4 @@ int gpr_cpu_num_cores(); [0, gpr_cpu_num_cores() - 1] */ int gpr_cpu_current_cpu(); -#endif /* __GRPC_INTERNAL_SUPPORT_CPU_H__ */ +#endif /* __GRPC_INTERNAL_SUPPORT_CPU_H__ */ diff --git a/src/core/support/murmur_hash.h b/src/core/support/murmur_hash.h index 5643717cd2..2ebf3e57b1 100644 --- a/src/core/support/murmur_hash.h +++ b/src/core/support/murmur_hash.h @@ -41,4 +41,4 @@ /* compute the hash of key (length len) */ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed); -#endif /* __GRPC_INTERNAL_SUPPORT_MURMUR_HASH_H__ */ +#endif /* __GRPC_INTERNAL_SUPPORT_MURMUR_HASH_H__ */ diff --git a/src/core/support/thd_internal.h b/src/core/support/thd_internal.h index 519177a555..190d4e3668 100644 --- a/src/core/support/thd_internal.h +++ b/src/core/support/thd_internal.h @@ -36,4 +36,4 @@ /* Internal interfaces between modules within the gpr support library. */ -#endif /* __GRPC_INTERNAL_SUPPORT_THD_INTERNAL_H__ */ +#endif /* __GRPC_INTERNAL_SUPPORT_THD_INTERNAL_H__ */ |