diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2004-11-04 20:35:08 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2004-11-04 20:35:08 +0000 |
| commit | 968e08d615b03db2f3c8b5b6b40807240cc436da (patch) | |
| tree | 4605871febad9093addde4bad9b0460ca4e5212d | |
| parent | 106f5de5a5069c016b6e2c1929ffe217bf9a3c84 (diff) | |
| download | gcc-968e08d615b03db2f3c8b5b6b40807240cc436da.zip gcc-968e08d615b03db2f3c8b5b6b40807240cc436da.tar.gz gcc-968e08d615b03db2f3c8b5b6b40807240cc436da.tar.bz2 | |
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
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/internal.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 48f6527..85fa04f 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 dc1e8fb..15a3dfa 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 |