From 02f61fc8612855a9a269cd724f1fc54634f95217 Mon Sep 17 00:00:00 2001
From: ljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 10 Aug 2001 17:39:34 +0000
Subject: [PATCH] * gnu/gcj/convert/natIconv.cc (done): Use HAVE_ICONV.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44772 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 1 +
libjava/gnu/gcj/convert/natIconv.cc | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fa6381ae8314..1421e4c910db 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,7 @@
2001-08-10 Loren J. Rittle <ljrittle@acm.org>
* java/lang/natObject.cc (is_mp): Protect use of _SC_NPROCESSORS_ONLN.
+ * gnu/gcj/convert/natIconv.cc (done): Use HAVE_ICONV.
2001-08-06 Tom Tromey <tromey@redhat.com>
diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc
index 1eb869dd0f19..03fad96f1f35 100644
--- a/libjava/gnu/gcj/convert/natIconv.cc
+++ b/libjava/gnu/gcj/convert/natIconv.cc
@@ -118,6 +118,7 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
void
gnu::gcj::convert::Input_iconv::done ()
{
+#ifdef HAVE_ICONV
// 50 bytes should be enough for any reset sequence.
size_t avail = 50;
char tmp[avail];
@@ -127,6 +128,9 @@ gnu::gcj::convert::Input_iconv::done ()
// might be generated in that situation.
iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
BytesToUnicode::done ();
+#else /* HAVE_ICONV */
+ // If no iconv, do nothing
+#endif /* HAVE_ICONV */
}
void
@@ -269,6 +273,7 @@ gnu::gcj::convert::IOConverter::iconv_init (void)
void
gnu::gcj::convert::Output_iconv::done ()
{
+#ifdef HAVE_ICONV
// 50 bytes should be enough for any reset sequence.
size_t avail = 50;
char tmp[avail];
@@ -278,4 +283,7 @@ gnu::gcj::convert::Output_iconv::done ()
// might be generated in that situation.
iconv_adapter (iconv, (iconv_t) handle, NULL, NULL, &p, &avail);
UnicodeToBytes::done ();
+#else /* HAVE_ICONV */
+ // If no iconv, do nothing
+#endif /* HAVE_ICONV */
}
--
GitLab