From d1d67428480b8fb1b38d3408fad6ca53e14823cc Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 1 Feb 2005 10:52:50 +0000 Subject: 20759, 20760, 20765: Improve Cygwin configuration --- Src/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src/utils.c') diff --git a/Src/utils.c b/Src/utils.c index 21416a535..26e6b934a 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -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; -- cgit v1.2.3