--- gcc/java/lex.h.orig	Sat Jun 25 03:33:05 2005
+++ gcc/java/lex.h	Sat May 12 21:44:38 2007
@@ -35,10 +35,6 @@
 /* A Unicode character, as read from the input file  */
 typedef unsigned short unicode_t;
 
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
 #if defined HAVE_ICONV
 #include <iconv.h>
 #endif /* HAVE_ICONV */