diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/system.h | 2 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Src/system.h b/Src/system.h index 65e681771..37f7d9fe3 100644 --- a/Src/system.h +++ b/Src/system.h @@ -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 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; |