diff options
| author | gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-04 20:35:08 +0000 |
|---|---|---|
| committer | gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-04 20:35:08 +0000 |
| commit | 39b83bdb58704a457a2e83ad4d49f3ddffd52e85 (patch) | |
| tree | 4605871febad9093addde4bad9b0460ca4e5212d /libcpp | |
| parent | 4cb9d5c8800e7057a9fccbe49ae6b20b957f8340 (diff) | |
| download | gcc-39b83bdb58704a457a2e83ad4d49f3ddffd52e85.tar.gz | |
* 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
Diffstat (limited to 'libcpp')
| -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 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 |