* gdb_wchar.h: Change minimum libiconv to 0x108.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55b1d88b0ca65aa19dde97db961591c15ad70841..eb668c24ab6cb0326940cdfbf5c0347d099f90a4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-27  Tom Tromey  <tromey@redhat.com>
+
+       * gdb_wchar.h: Change minimum libiconv to 0x108.
+
 2010-09-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Fix lost siginfo_t for inferior calls.

diff --git a/gdb/gdb_wchar.h b/gdb/gdb_wchar.h
index 80c595f4aa78e5613f95616982c173fb97886994..e5ba4a850a4e75b7ee6a65b323807a18501c5494 100644 (file)
--- 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 <wchar.h>
 #include <wctype.h>
@@ -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