diff options
Diffstat (limited to 'src/nvim/lib')
| -rw-r--r-- | src/nvim/lib/khash.h | 16 | ||||
| -rw-r--r-- | src/nvim/lib/klist.h | 9 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h index 51a666733b..f706e994d5 100644 --- a/src/nvim/lib/khash.h +++ b/src/nvim/lib/khash.h @@ -129,9 +129,10 @@ int main() { #include <string.h> #include <limits.h> -#include "nvim/func_attr.h" #include "nvim/memory.h" +#include "nvim/func_attr.h" + /* compiler specific configuration */ #if UINT_MAX == 0xffffffffu @@ -206,7 +207,7 @@ static const double __ac_HASH_UPPER = 0.77; return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t)); \ } \ SCOPE void kh_destroy_##name(kh_##name##_t *h) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE void kh_destroy_##name(kh_##name##_t *h) \ { \ if (h) { \ @@ -216,7 +217,7 @@ static const double __ac_HASH_UPPER = 0.77; } \ } \ SCOPE void kh_clear_##name(kh_##name##_t *h) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE void kh_clear_##name(kh_##name##_t *h) \ { \ if (h && h->flags) { \ @@ -225,7 +226,7 @@ static const double __ac_HASH_UPPER = 0.77; } \ } \ SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \ { \ if (h->n_buckets) { \ @@ -241,7 +242,7 @@ static const double __ac_HASH_UPPER = 0.77; } else return 0; \ } \ SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \ { /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \ khint32_t *new_flags = 0; \ @@ -302,7 +303,7 @@ static const double __ac_HASH_UPPER = 0.77; } \ } \ SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \ { \ khint_t x; \ @@ -344,7 +345,7 @@ static const double __ac_HASH_UPPER = 0.77; return x; \ } \ SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \ { \ if (x != h->n_buckets && !__ac_iseither(h->flags, x)) { \ @@ -622,5 +623,4 @@ typedef const char *kh_cstr_t; */ #define KHASH_MAP_INIT_STR(name, khval_t) \ KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal) - #endif /* __AC_KHASH_H */ diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h index 07fd872e1a..4cc87263a4 100644 --- a/src/nvim/lib/klist.h +++ b/src/nvim/lib/klist.h @@ -29,8 +29,8 @@ #include <stdbool.h> #include <stdlib.h> -#include "nvim/func_attr.h" #include "nvim/memory.h" +#include "nvim/func_attr.h" #define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f) \ typedef struct { \ @@ -56,7 +56,7 @@ --mp->cnt; \ if (mp->n == mp->max) { \ mp->max = mp->max? mp->max<<1 : 16; \ - mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ + mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ } \ mp->buf[mp->n++] = p; \ } @@ -79,7 +79,7 @@ kmp_##name##_t *mp; \ size_t size; \ } kl_##name##_t; \ - static inline kl_##name##_t *kl_init_##name(void) { \ + static inline kl_##name##_t *kl_init_##name(void) { \ kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t)); \ kl->mp = kmp_init(name); \ kl->head = kl->tail = kmp_alloc(name, kl->mp); \ @@ -87,7 +87,7 @@ return kl; \ } \ static inline void kl_destroy_##name(kl_##name##_t *kl) \ - FUNC_ATTR_UNUSED; \ + REAL_FATTR_UNUSED; \ static inline void kl_destroy_##name(kl_##name##_t *kl) { \ kl1_##name *p; \ for (p = kl->head; p != kl->tail; p = p->next) \ @@ -124,5 +124,4 @@ #define kl_pushp(name, kl) kl_pushp_##name(kl) #define kl_shift(name, kl, d) kl_shift_##name(kl, d) #define kl_empty(kl) ((kl)->size == 0) - #endif |