diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/lex.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a0821b0..744200c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-11-06 Zack Weinberg <zack@codesourcery.com> + Gerald Pfeifer <gerald@pfeifer.com> + + * lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H + as well. + 2004-11-02 Bryce McKinlay <mckinlay@redhat.com> PR java/17265 diff --git a/gcc/java/lex.h b/gcc/java/lex.h index 37ace45..e7dabf5 100644 --- a/gcc/java/lex.h +++ b/gcc/java/lex.h @@ -35,7 +35,11 @@ extern FILE *finput; /* A Unicode character, as read from the input file */ typedef unsigned short unicode_t; -#if defined HAVE_ICONV_H && defined HAVE_ICONV +#ifndef HAVE_ICONV_H +#undef HAVE_ICONV +#endif + +#if defined HAVE_ICONV #include <iconv.h> #endif /* HAVE_ICONV */ |