diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-09 11:19:37 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-08-09 11:19:37 +0200 |
| commit | 8a56bd944a944cf77a0b9f44b59098dae05b07a0 (patch) | |
| tree | 2693a0f4599ec4efb02b48f031106794e56cd1d0 /src/nvim/eval.c | |
| parent | 47b7b471fa0f33550f886dc93976ded97f602292 (diff) | |
| parent | d6f15ccc3c7ce04ff79c82dd8ea003f67c82ba94 (diff) | |
| download | rneovim-8a56bd944a944cf77a0b9f44b59098dae05b07a0.tar.gz rneovim-8a56bd944a944cf77a0b9f44b59098dae05b07a0.tar.bz2 rneovim-8a56bd944a944cf77a0b9f44b59098dae05b07a0.zip | |
Merge #10708 'remove DYNAMIC_ICONV'
closes #3457
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7ffa59f298..3def9adcea 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11259,7 +11259,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) "fork", #endif "gettext", -#if defined(HAVE_ICONV_H) && defined(USE_ICONV) +#if defined(HAVE_ICONV) "iconv", #endif "insert_expand", @@ -11372,10 +11372,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) n = stdout_isatty; } else if (STRICMP(name, "multi_byte_encoding") == 0) { n = has_mbyte != 0; -#if defined(USE_ICONV) && defined(DYNAMIC_ICONV) - } else if (STRICMP(name, "iconv") == 0) { - n = iconv_enabled(false); -#endif } else if (STRICMP(name, "syntax_items") == 0) { n = syntax_present(curwin); #ifdef UNIX |