diff options
author | Mak Dharma <makarandd@google.com> | 2017-05-30 20:02:53 -0700 |
---|---|---|
committer | Mak Dharma <makarandd@google.com> | 2017-05-30 20:02:53 -0700 |
commit | 195eacea6d78c9aeb277f291448d1aba38f18f86 (patch) | |
tree | 576fefb90952dd36da8bffe1883c8528d4825982 /test/core | |
parent | 9baf4b19f0e4133dce8e4083fdae4349f6f034da (diff) | |
parent | a9f94e9882e5c9978fb6376d94a7144f53ab1c4b (diff) |
Merge branch 'win_bldfix' of https://github.com/makdharma/grpc into win_bldfix
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/census/intrusive_hash_map_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/census/intrusive_hash_map_test.c b/test/core/census/intrusive_hash_map_test.c index fe8d3a1675..552546f9a3 100644 --- a/test/core/census/intrusive_hash_map_test.c +++ b/test/core/census/intrusive_hash_map_test.c @@ -49,7 +49,7 @@ static const uint32_t kInitialLog2Size = 4; typedef struct object { uint64_t val; } object; /* Helper function to allocate and initialize object. */ -static inline object *make_new_object(uint64_t val) { +static __inline object *make_new_object(uint64_t val) { object *obj = (object *)gpr_malloc(sizeof(object)); obj->val = val; return obj; @@ -63,7 +63,7 @@ typedef struct ptr_item { /* Helper function that creates a new hash map item. It is up to the user to * free the item that was allocated. */ -static inline ptr_item *make_ptr_item(uint64_t key, uint64_t value) { +static __inline ptr_item *make_ptr_item(uint64_t key, uint64_t value) { ptr_item *new_item = (ptr_item *)gpr_malloc(sizeof(ptr_item)); new_item->IHM_key = key; new_item->IHM_hash_link = NULL; |