diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-07-06 20:10:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-07-06 20:10:41 +0000 |
| commit | 6dfb90cf55f7a7abfcbe6a4bf80b38569cc2a8b6 (patch) | |
| tree | 06a0be07899ac10cca7cc949fdc95c1331d3b061 /libjava/gnu/gcj | |
| parent | 4b7d2f0796e4f0a49fb56c2ec6477db742b919b6 (diff) | |
| download | gcc-6dfb90cf55f7a7abfcbe6a4bf80b38569cc2a8b6.zip gcc-6dfb90cf55f7a7abfcbe6a4bf80b38569cc2a8b6.tar.gz gcc-6dfb90cf55f7a7abfcbe6a4bf80b38569cc2a8b6.tar.bz2 | |
InputStreamReader.java (refill): Handle no-progress case correctly.
* java/io/InputStreamReader.java (refill): Handle no-progress
case correctly.
* gnu/gcj/convert/IOConverter.java: Add 'utf8' alias.
From-SVN: r101663
Diffstat (limited to 'libjava/gnu/gcj')
| -rw-r--r-- | libjava/gnu/gcj/convert/IOConverter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java index ba3260a..2c6849c 100644 --- a/libjava/gnu/gcj/convert/IOConverter.java +++ b/libjava/gnu/gcj/convert/IOConverter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation +/* Copyright (C) 2000, 2001, 2005 Free Software Foundation This file is part of libgcj. @@ -28,6 +28,8 @@ public abstract class IOConverter // canonical name. hash.put ("iso-latin-1", "8859_1"); hash.put ("iso8859_1", "8859_1"); + // At least one build script out there uses 'utf8'. + hash.put ("utf8", "UTF8"); // On Solaris the default encoding, as returned by nl_langinfo(), // is `646' (aka ASCII), but the Solaris iconv_open() doesn't // understand that. We work around the problem by adding an |