summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authorapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2000-09-26 19:00:28 +0000
committerapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2000-09-26 19:00:28 +0000
commit48db617ddd1d3e7cc97cb7fa078dcfa47c0a359b (patch)
tree2770e048b0b145ab70b800c01316a21a8c05cab6 /libjava
parent99b02af1968d50929a11537e0a6ce4ed68368bb7 (diff)
downloadppe42-gcc-48db617ddd1d3e7cc97cb7fa078dcfa47c0a359b.tar.gz
ppe42-gcc-48db617ddd1d3e7cc97cb7fa078dcfa47c0a359b.zip
2000-09-26 Alexandre Petit-Bianco <apbianco@cygnus.com>
* java/lang/natSystem.cc (file_encoding): Added return statement. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36647 138bc75d-0d04-0410-961f-82ee72b054a4
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 6327de5be46..9df621f32b9 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 ca75430a8a4..0022e2ed61f 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 ()
OpenPOWER on IntegriCloud