diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-18 02:52:44 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-18 02:52:44 +0000 |
| commit | b9e8aea16c4b31de3c72a77bf6f41807843419bd (patch) | |
| tree | 072c351afd7a4ed8a7e0bca3305104cb627eeea2 /libjava | |
| parent | 792433e378e74abeabe215950959e2848050b147 (diff) | |
| download | gcc-b9e8aea16c4b31de3c72a77bf6f41807843419bd.tar.gz | |
* name-finder.cc (toHex): Use word mode, not long long.
* gnu/gcj/convert/natIconv.cc (write): Avoid sign-compare warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49829 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/natIconv.cc | 2 | ||||
| -rw-r--r-- | libjava/name-finder.cc | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 24e87e6fdea..cf37be1e690 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-02-18 Jason Merrill <jason@redhat.com> + + * name-finder.cc (toHex): Use word mode, not long long. + + * gnu/gcj/convert/natIconv.cc (write): Avoid sign-compare warning. + 2002-02-15 Tom Tromey <tromey@redhat.com> Fix for PR libgcj/5695: diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index 3c10c8ace61..0ed8606f94b 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -213,7 +213,7 @@ gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer, size_t r = iconv_adapter (iconv, (iconv_t) handle, &inbuf, &inavail, &outbuf, &outavail); - if (r == -1 && inavail == loop_old_in) + if (r == (size_t) -1 && inavail == loop_old_in) { inavail -= 2; if (inavail == 0) diff --git a/libjava/name-finder.cc b/libjava/name-finder.cc index 5b6e1116fb3..3cf1043d84b 100644 --- a/libjava/name-finder.cc +++ b/libjava/name-finder.cc @@ -112,7 +112,8 @@ _Jv_name_finder::_Jv_name_finder (char *executable) void _Jv_name_finder::toHex (void *p) { - unsigned long long n = (unsigned long long)p; + typedef unsigned word_t __attribute ((mode (word))); + word_t n = (word_t) p; int digits = sizeof (void *) * 2; strcpy (hex, "0x"); |