1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00

20759, 20760, 20765: Improve Cygwin configuration

This commit is contained in:
Peter Stephenson 2005-02-01 10:52:50 +00:00
parent 8b53cc45bd
commit d1d6742848
4 changed files with 17 additions and 5 deletions

View file

@ -700,7 +700,7 @@ extern short ospeed;
#else
# ifdef HAVE_LANGINFO_H
# include <langinfo.h>
# if defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
# if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
# include <iconv.h>
# endif
# endif

View file

@ -3510,7 +3510,7 @@ 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) || defined(HAVE_LIBICONV))
# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && (defined(HAVE_ICONV_H) || defined(HAVE_ICONV) || defined(HAVE_LIBICONV))
iconv_t cd;
char inbuf[4];
size_t inbytes, outbytes;
@ -3631,7 +3631,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
t += ucs4toutf8(t, wval);
continue;
} else {
# if defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
# if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) || defined(HAVE_LIBICONV)
inbytes = 4;
outbytes = 6;
inptr = inbuf;