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 <gerald@pfeifer.com>
From-SVN: r90168

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a0821b0a8213abb859d534644cd8553eecb0ec79..744200cb735dfa06ffde9f4925db3748d765873a 100644 (file)
--- 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 37ace45582e065d83129c6768cd0eaa4e2691e02..e7dabf535bec183c60b642dcda6444b39b7e9a94 100644 (file)
--- 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 */