diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-12-15 14:51:39 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-12-15 14:51:39 +0000 |
| commit | f7037211ad3a9e4f61a5d1aad8eceab5e01b4663 (patch) | |
| tree | 5b9d6f8cabf4ed369f585840e5d78b22acb08d34 /Src/utils.c | |
| parent | b5a83cc7549e48a82dd57859f40a8f282f1534d0 (diff) | |
| download | zsh-f7037211ad3a9e4f61a5d1aad8eceab5e01b4663.tar.gz zsh-f7037211ad3a9e4f61a5d1aad8eceab5e01b4663.tar.xz zsh-f7037211ad3a9e4f61a5d1aad8eceab5e01b4663.zip | |
22085 and back off 22075: include langinfo.h to get iconv
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index e391bc281..4fb52cff5 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3918,7 +3918,7 @@ dquotedzputs(char const *s, FILE *stream) } #endif -# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && !defined(__STDC_ISO_10646__) && !defined(MULTIBYTE_SUPPORT) +# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && !defined(__STDC_ISO_10646__) /* Convert a character from UCS4 encoding to UTF-8 */ static size_t @@ -3983,7 +3983,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc) char svchar = '\0'; int meta = 0, control = 0; int i; -#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && (defined(__STDC_ISO_10646__) || defined(MULTIBYTE_SUPPORT)) +#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && defined(__STDC_ISO_10646__) wint_t wval; size_t count; #else @@ -4092,7 +4092,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc) *misc = wval; return s+1; } -#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && (defined(__STDC_ISO_10646__) || defined(MULTIBYTE_SUPPORT)) +#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTOMB) && defined(__STDC_ISO_10646__) count = wctomb(t, (wchar_t)wval); if (count == (size_t)-1) { zerr("character not in range", NULL, 0); |