From 968e08d615b03db2f3c8b5b6b40807240cc436da Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@codesourcery.com>
Date: Thu, 4 Nov 2004 20:35:08 +0000
Subject: [PATCH] internal.h (HAVE_ICONV): Undefine if we do not have
 HAVE_ICONV_H as well.

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

Co-Authored-By: Gerald Pfeifer <gerald@pfeifer.com>

From-SVN: r90079
---
 libcpp/ChangeLog  | 6 ++++++
 libcpp/internal.h | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 48f65270ac9..85fa04f7038 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Zack Weinberg  <zack@codesourcery.com>
+            Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* internal.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H
+	as well.
+
 2004-10-27  Zack Weinberg  <zack@codesourcery.com>
 
 	PR 18075
diff --git a/libcpp/internal.h b/libcpp/internal.h
index dc1e8fb3d65..15a3dfada9e 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -26,7 +26,11 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "symtab.h"
 #include "cpp-id-data.h"
 
-#if defined HAVE_ICONV_H && defined HAVE_ICONV
+#ifndef HAVE_ICONV_H
+#undef HAVE_ICONV
+#endif
+
+#if HAVE_ICONV
 #include <iconv.h>
 #else
 #define HAVE_ICONV 0