From d08bf5fa33ca8d704846d234a59a13168f97d5a5 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sat, 6 Nov 2004 08:50:30 +0000 Subject: [PATCH] lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H as well. * lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H as well. Co-Authored-By: Gerald Pfeifer From-SVN: r90168 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/lex.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a0821b0a821..744200cb735 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-11-06 Zack Weinberg + Gerald Pfeifer + + * lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H + as well. + 2004-11-02 Bryce McKinlay PR java/17265 diff --git a/gcc/java/lex.h b/gcc/java/lex.h index 37ace45582e..e7dabf535be 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 #endif /* HAVE_ICONV */ -- 2.30.2