aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/java/lang/natSystem.cc1
2 files changed, 5 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6327de5..9df621f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-26 Alexandre Petit-Bianco <apbianco@cygnus.com>
+
+ * java/lang/natSystem.cc (file_encoding): Added return statement.
+
2000-09-14 Alexandre Oliva <aoliva@redhat.com>
* Makefile.am: Re-work shell commands that exceeded command-line
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index ca75430..0022e2e 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -165,6 +165,7 @@ file_encoding ()
char *e = nl_langinfo (CODESET);
if (e == NULL || *e == '\0')
e = "8859_1";
+ return e;
}
#define DEFAULT_FILE_ENCODING file_encoding ()