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

	as well.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90079 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 48f6527..85fa04f 100644 (file)
--- 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
 2004-10-27  Zack Weinberg  <zack@codesourcery.com>
 
        PR 18075

diff --git a/libcpp/internal.h b/libcpp/internal.h
index dc1e8fb..15a3dfa 100644 (file)
--- 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"
 
 #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
 #include <iconv.h>
 #else
 #define HAVE_ICONV 0