diff options
| -rw-r--r-- | config/config.h.in | 1 | ||||
| -rw-r--r-- | src/charset.c | 4 | ||||
| -rw-r--r-- | src/mbyte.c | 10 | ||||
| -rw-r--r-- | src/spell.c | 4 |
4 files changed, 3 insertions, 16 deletions
diff --git a/config/config.h.in b/config/config.h.in index e9cc3d9eef..f2149bf083 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -85,7 +85,6 @@ #define HAVE_UTIME 1 #define HAVE_UTIME_H 1 #define HAVE_UTIMES 1 -#define HAVE_WCHAR_H 1 #define HAVE_WCTYPE_H 1 #cmakedefine HAVE_WORKING_LIBINTL #define RETSIGTYPE void diff --git a/src/charset.c b/src/charset.c index 94ed2c6f4f..b88682b88a 100644 --- a/src/charset.c +++ b/src/charset.c @@ -4,6 +4,7 @@ #include <string.h> #include <wctype.h> +#include <wchar.h> // for towupper() and towlower() #include "vim.h" #include "charset.h" @@ -19,9 +20,6 @@ static int win_chartabsize(win_T *wp, char_u *p, colnr_T col); -#if defined(HAVE_WCHAR_H) -# include <wchar.h> // for towupper() and towlower() -#endif // if defined(HAVE_WCHAR_H) static int win_nolbr_chartabsize(win_T *wp, char_u *s, colnr_T col, int *headp); diff --git a/src/mbyte.c b/src/mbyte.c index 112dad1bc3..facea8e02e 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -78,6 +78,7 @@ */ #include <string.h> +# include <wchar.h> #include "vim.h" #include "mbyte.h" @@ -95,15 +96,6 @@ # define WINBYTE BYTE - - - -#ifdef HAVE_WCHAR_H -# include <wchar.h> -#endif - - - static int enc_canon_search(char_u *name); static int dbcs_char2len(int c); static int dbcs_char2bytes(int c, char_u *buf); diff --git a/src/spell.c b/src/spell.c index a50d872fa1..7a986d98d2 100644 --- a/src/spell.c +++ b/src/spell.c @@ -964,9 +964,7 @@ static void close_spellbuf(buf_T *buf); * differ from what the .spl file uses. * These must not be called with negative number! */ -# if defined(HAVE_WCHAR_H) -# include <wchar.h> /* for towupper() and towlower() */ -# endif +#include <wchar.h> /* for towupper() and towlower() */ /* Multi-byte implementation. For Unicode we can call utf_*(), but don't do * that for ASCII, because we don't want to use 'casemap' here. Otherwise use * the "w" library function for characters above 255. */ |