mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-02 22:11:54 +02:00
Merge of 23326: with no __STDC_ISO_10646__ or HAVE_ICONV but with HAVE_NL_LANGINFO and CODESET the code wouldn't compile.
This commit is contained in:
parent
66c2b597dc
commit
897dd450e5
1 changed files with 3 additions and 1 deletions
|
@ -3525,10 +3525,12 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
|
|||
size_t count;
|
||||
#else
|
||||
unsigned int wval;
|
||||
# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && defined(HAVE_ICONV)
|
||||
# if defined(HAVE_NL_LANGINFO) && defined(CODESET)
|
||||
# if defined(HAVE_ICONV)
|
||||
iconv_t cd;
|
||||
char inbuf[4];
|
||||
size_t inbytes, outbytes;
|
||||
# endif
|
||||
size_t count;
|
||||
# endif
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue