diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 170c5761f..511271ea2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-26 Peter Stephenson <pws@csr.com> + + * Phil Pennock: 23326: Src/utils.c: with no __STDC_ISO_10646__ + or HAVE_ICONV but with HAVE_NL_LANGINFO and CODESET the + code wouldn't compile. + 2007-04-23 Peter Stephenson <pws@csr.com> * unposted: Src/parse.c: make sure we get "invalid zwc file" diff --git a/Src/utils.c b/Src/utils.c index 6041e092b..35915a2e7 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4569,10 +4569,12 @@ getkeystring(char *s, int *len, int how, int *misc) int 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 |