diff options
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/IOConverter.java | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ae57a887d69..12c86fc5cc7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2001-08-17 Tom Tromey <tromey@redhat.com> + + * gnu/gcj/convert/IOConverter.java: Add `646' alias. + 2001-08-17 Hans-J. Boehm <Hans_Boehm@hp.com> * BigInteger.java: fix right shifts by nonzero multiples of 32. diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java index ccb994f56ef..353f31c609c 100644 --- a/libjava/gnu/gcj/convert/IOConverter.java +++ b/libjava/gnu/gcj/convert/IOConverter.java @@ -27,6 +27,11 @@ public abstract class IOConverter // Manually maintained aliases. Note that the value must be our // canonical name. hash.put ("iso-latin-1", "8859_1"); + // 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 + // explicit alias for Solaris users. + hash.put ("646", "ASCII"); // All aliases after this point are automatically generated by the // `encodings.pl' script. Run it to make any corrections. hash.put ("ansi_x3.4-1968", "ASCII"); |