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/vim.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/vim.h')
| -rw-r--r-- | src/nvim/vim.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 47ed223e81..a766d71553 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -381,38 +381,6 @@ enum { #include "nvim/buffer_defs.h" /* buffer and windows */ #include "nvim/ex_cmds_defs.h" /* Ex command defines */ -# ifdef USE_ICONV -# ifndef EILSEQ -# define EILSEQ 123 -# endif -# ifdef DYNAMIC_ICONV -/* On Win32 iconv.dll is dynamically loaded. */ -# define ICONV_ERRNO (*iconv_errno()) -# define ICONV_E2BIG 7 -# define ICONV_EINVAL 22 -# define ICONV_EILSEQ 42 -# else -# define ICONV_ERRNO errno -# define ICONV_E2BIG E2BIG -# define ICONV_EINVAL EINVAL -# define ICONV_EILSEQ EILSEQ -# endif -# endif - - - - - - - - - - - - - - - # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr( \ VV_HLSEARCH, !no_hlsearch) |