diff options
| author | ZyX <kp-pav@ya.ru> | 2014-05-18 00:54:48 +0400 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-06-02 11:04:18 -0300 |
| commit | 8c0ca573e5cc6811d14b6789732926719c5a2585 (patch) | |
| tree | d531e69dd9caa62272b95afabd897d7266334d27 | |
| parent | 6498b281fa4fdb3728944b30f18981613b621925 (diff) | |
| download | rneovim-8c0ca573e5cc6811d14b6789732926719c5a2585.tar.gz rneovim-8c0ca573e5cc6811d14b6789732926719c5a2585.tar.bz2 rneovim-8c0ca573e5cc6811d14b6789732926719c5a2585.zip | |
Surround nvim/func_attr.h includes with define/undef DEFINE_FUNC_ATTRIBUTES
Required for FUNC_ATTR_UNUSED to work in lib/k*
| -rw-r--r-- | src/nvim/lib/khash.h | 3 | ||||
| -rw-r--r-- | src/nvim/lib/klist.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h index 51a666733b..090b690290 100644 --- a/src/nvim/lib/khash.h +++ b/src/nvim/lib/khash.h @@ -129,7 +129,9 @@ int main() { #include <string.h> #include <limits.h> +#define DEFINE_FUNC_ATTRIBUTES #include "nvim/func_attr.h" +#undef DEFINE_FUNC_ATTRIBUTES #include "nvim/memory.h" /* compiler specific configuration */ @@ -622,5 +624,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..d69157fc44 100644 --- a/src/nvim/lib/klist.h +++ b/src/nvim/lib/klist.h @@ -29,7 +29,9 @@ #include <stdbool.h> #include <stdlib.h> +#define DEFINE_FUNC_ATTRIBUTES #include "nvim/func_attr.h" +#undef DEFINE_FUNC_ATTRIBUTES #include "nvim/memory.h" #define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f) \ @@ -124,5 +126,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 |