From: Loren J. Rittle <ljrittle@acm.org>
Date: Fri, 10 Aug 2001 17:39:34 +0000 (+0000)
Subject: * gnu/gcj/convert/natIconv.cc (done): Use HAVE_ICONV.
X-Git-Tag: prereleases/libstdc++-3.0.95~2751
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e15d3a83a314538349311b61c27c5357ba100b1;p=thirdparty%2Fgcc.git

* gnu/gcj/convert/natIconv.cc (done): Use HAVE_ICONV.

From-SVN: r44772
---

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 */
 }