From 716b65bf40998f09290ef4806168edb636c4bacc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 27 Sep 2010 17:28:50 +0000 Subject: [PATCH] * gdb_wchar.h: Change minimum libiconv to 0x108. --- gdb/ChangeLog | 4 ++++ gdb/gdb_wchar.h | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 55b1d88..eb668c2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-09-27 Tom Tromey + + * gdb_wchar.h: Change minimum libiconv to 0x108. + 2010-09-24 Jan Kratochvil Fix lost siginfo_t for inferior calls. diff --git a/gdb/gdb_wchar.h b/gdb/gdb_wchar.h index 80c595f..e5ba4a8 100644 --- a/gdb/gdb_wchar.h +++ b/gdb/gdb_wchar.h @@ -52,12 +52,11 @@ /* We use "btowc" as a sentinel to detect functioning wchar_t support. We check for either __STDC_ISO_10646__ or a new-enough libiconv in order to ensure we can convert to and from wchar_t. We choose - libiconv version 0x10D because it was reported that earlier - versions do not always accept "wchar_t" as an encoding - argument. */ + libiconv version 0x108 because it is the first version with + iconvlist. */ #if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \ && (defined (__STDC_ISO_10646__) \ - || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x10D)) + || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) #include #include @@ -84,7 +83,7 @@ typedef wint_t gdb_wint_t; #else #define INTERMEDIATE_ENCODING "UCS-4LE" #endif -#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x10D +#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 #define INTERMEDIATE_ENCODING "wchar_t" #else /* This shouldn't happen, because the earlier #if should have filtered -- 2.7.4