aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer_defs.h
diff options
context:
space:
mode:
authorNicolas Hillegeer <nicolas@hillegeer.com>2014-11-01 18:34:42 +0100
committerNicolas Hillegeer <nicolas@hillegeer.com>2014-11-06 00:18:26 +0100
commit8c5efd62ac97b0a44fb5a68e4fd91997fcede000 (patch)
treed5f696072e4f2879cd77d48d4d8e3bde0a6bd14e /src/nvim/buffer_defs.h
parent3972715ce791466c1ea3c873f78e95e13eba6e58 (diff)
downloadrneovim-8c5efd62ac97b0a44fb5a68e4fd91997fcede000.tar.gz
rneovim-8c5efd62ac97b0a44fb5a68e4fd91997fcede000.tar.bz2
rneovim-8c5efd62ac97b0a44fb5a68e4fd91997fcede000.zip
iconv: re-enable
This seems to have been disabled in the transition from vim to neovim, re-enable it.
Diffstat (limited to 'src/nvim/buffer_defs.h')
-rw-r--r--src/nvim/buffer_defs.h11
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.
*/