diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-06 07:14:36 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-06 07:14:36 -0500 |
| commit | 37d608b8c179dd7a68bdf6edf985e4df453231cc (patch) | |
| tree | 351e8fe02ea21b5cff353579234a8631c7ed2654 /src/nvim/buffer_defs.h | |
| parent | 4cc26fba249361cccd791a76fc35c46d851096a5 (diff) | |
| parent | 8c5efd62ac97b0a44fb5a68e4fd91997fcede000 (diff) | |
| download | rneovim-37d608b8c179dd7a68bdf6edf985e4df453231cc.tar.gz rneovim-37d608b8c179dd7a68bdf6edf985e4df453231cc.tar.bz2 rneovim-37d608b8c179dd7a68bdf6edf985e4df453231cc.zip | |
Merge pull request #1370 from aktau/enable-iconv
re-enable iconv
Diffstat (limited to 'src/nvim/buffer_defs.h')
| -rw-r--r-- | src/nvim/buffer_defs.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 6d097010ac..4ea288c258 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -11,6 +11,8 @@ #include "nvim/pos.h" // for the number window-local and buffer-local options #include "nvim/option_defs.h" +// for optional iconv support +#include "nvim/iconv.h" // for jump list and tag stack sizes in a buffer and mark types #include "nvim/mark_defs.h" // for u_header_T @@ -281,15 +283,6 @@ typedef struct argentry { #define ARGCOUNT (ALIST(curwin)->al_ga.ga_len) #define WARGCOUNT(wp) (ALIST(wp)->al_ga.ga_len) -#ifdef USE_ICONV -# ifdef HAVE_ICONV_H -# include <iconv.h> -# else -# include <errno.h> -typedef void *iconv_t; -# endif -#endif - /* * Used for the typeahead buffer: typebuf. */ |