diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-15 00:05:15 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-15 00:05:15 +0000 |
| commit | 897dd450e5fa0314ed530f1aa406683305915af3 (patch) | |
| tree | bf78d132317fca6f662a73062434f997f8d8071d /Src | |
| parent | 66c2b597dca56fbec91488637262ed2a713cfc3f (diff) | |
| download | zsh-897dd450e5fa0314ed530f1aa406683305915af3.tar.gz zsh-897dd450e5fa0314ed530f1aa406683305915af3.tar.xz zsh-897dd450e5fa0314ed530f1aa406683305915af3.zip | |
Merge of 23326: with no __STDC_ISO_10646__ or HAVE_ICONV but with HAVE_NL_LANGINFO and CODESET the code wouldn't compile.
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Src/utils.c b/Src/utils.c index d2250f465..e1459cb2b 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -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 |