diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-18 17:18:55 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-18 17:18:55 +0000 |
| commit | 6a65ea5be3974fda8ad750906ae553914f1c5f0b (patch) | |
| tree | c730d43d82ddc3501070878cc145dfc13ced9f06 /gcc/java/lex.c | |
| parent | f91abfce7bf63f0071f10f2d07ef9e97561a5497 (diff) | |
| download | gcc-6a65ea5be3974fda8ad750906ae553914f1c5f0b.zip gcc-6a65ea5be3974fda8ad750906ae553914f1c5f0b.tar.gz gcc-6a65ea5be3974fda8ad750906ae553914f1c5f0b.tar.bz2 | |
For PR java/2812:
* lex.h: Use HAVE_ICONV, not HAVE_ICONV_H.
* lex.c (java_new_lexer): Use ICONV_CONST.
(java_read_char): Likewise.
* Make-lang.in (jc1$(exeext)): Link against LIBICONV.
(jv-scan$(exeext)): Likewise.
From-SVN: r44120
Diffstat (limited to 'gcc/java/lex.c')
| -rw-r--r-- | gcc/java/lex.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/java/lex.c b/gcc/java/lex.c index 35cd317..861b6eb 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -268,7 +268,8 @@ java_new_lexer (finput, encoding) outp = (char *) &result; outc = 2; - r = iconv (handle, (const char **) &inp, &inc, &outp, &outc); + r = iconv (handle, (ICONV_CONST char **) &inp, &inc, + &outp, &outc); iconv_close (handle); /* Conversion must be complete for us to use the result. */ if (r != (size_t) -1 && inc == 0 && outc == 0) @@ -370,8 +371,8 @@ java_read_char (lex) out_save = out_count; inp = &lex->buffer[lex->first]; outp = &lex->out_buffer[lex->out_last]; - ir = iconv (lex->handle, (const char **) &inp, &inbytesleft, - &outp, &out_count); + ir = iconv (lex->handle, (ICONV_CONST char **) &inp, + &inbytesleft, &outp, &out_count); /* If we haven't read any bytes, then look to see if we have read a BOM. */ |