diff options
| author | Tom Tromey <tromey@redhat.com> | 2010-09-27 17:28:50 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2010-09-27 17:28:50 +0000 |
| commit | 716b65bf40998f09290ef4806168edb636c4bacc (patch) | |
| tree | 42e3185fa7857ee99228cef9374439d7982584b3 /gdb/gdb_wchar.h | |
| parent | 43bb514a1cc9641dfdb0f3ac20de48e2c17c0135 (diff) | |
| download | gdb-716b65bf40998f09290ef4806168edb636c4bacc.zip gdb-716b65bf40998f09290ef4806168edb636c4bacc.tar.gz gdb-716b65bf40998f09290ef4806168edb636c4bacc.tar.bz2 | |
* gdb_wchar.h: Change minimum libiconv to 0x108.
Diffstat (limited to 'gdb/gdb_wchar.h')
| -rw-r--r-- | gdb/gdb_wchar.h | 9 |
1 files changed, 4 insertions, 5 deletions
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 <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 |