From 897dd450e5fa0314ed530f1aa406683305915af3 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Thu, 15 Nov 2007 00:05:15 +0000 Subject: Merge of 23326: with no __STDC_ISO_10646__ or HAVE_ICONV but with HAVE_NL_LANGINFO and CODESET the code wouldn't compile. --- Src/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Src') 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 -- cgit 1.4.1