This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: PATCH: Fix libcpp configury/portability issue

On Thu, 4 Nov 2004, Gerald Pfeifer wrote:
There are no inclusions of libcpp/internal.h anywhere in gcc/java (nor
should there be - any use of that header outside of cpplib is a bug).
And my patch has exactly the same effect as yours, it's just more
readable.  Thus I am inclined to think that this must be an unrelated
After some debugging, I believe you are right.

...and I believe the very same patch you suggested for libcpp helps in that case as well.

Bootstrapped on i386-unknown-freebsd4.10 and i686-pc-linux-gnu.

What do you think?


2004-11-05 Zack Weinberg <> Gerald Pfeifer <>

	* lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H
	as well.

Index: lex.h
RCS file: /cvs/gcc/gcc/gcc/java/lex.h,v
retrieving revision 1.41
diff -u -3 -p -r1.41 lex.h
--- lex.h	15 Oct 2004 14:55:00 -0000	1.41
+++ lex.h	4 Nov 2004 23:28:36 -0000
@@ -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
+#if defined HAVE_ICONV
 #include <iconv.h>
 #endif /* HAVE_ICONV */

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]