procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
From-SVN: r44772
This commit is contained in:
Loren J. Rittle 2001-08-10 17:39:34 +00:00 • committed by Loren J. Rittle
parent cc3835e651
commit 6e15d3a83a
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libjava/ChangeLog
View file

@ -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>

8
libjava/gnu/gcj/convert/natIconv.cc
View file

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