diff options
| -rw-r--r-- | lib/ChangeLog | 3 | ||||
| -rw-r--r-- | lib/linebreak.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 7648b96..de7bc49 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,8 @@ 2001-03-10 Bruno Haible <haible@clisp.cons.org> + * linebreak.c (iconv_string_length): Don't call + iconv(cd,NULL,NULL,NULL,NULL) on glibc-2.1; it crashes. + * localcharset.c (locale_charset): Allow wildcard syntax. Resolve alias also if codeset is empty. * config.charset (BeOS): Use wildcard syntax. diff --git a/lib/linebreak.c b/lib/linebreak.c index bd15abf..90879ac 100644 --- a/lib/linebreak.c +++ b/lib/linebreak.c @@ -1587,9 +1587,9 @@ iconv_string_length (cd, s, n) return (size_t)(-1); count += outptr - tmpbuf; } -#endif - /* return to the initial state */ + /* Return to the initial state. */ iconv (cd, NULL, NULL, NULL, NULL); +#endif return count; #undef TMPBUFSIZE } |