Changeset View
Changeset View
Standalone View
Standalone View
devel/gdb/files/patch-gdb-gdb_wchar.h
| --- gdb/gdb_wchar.h.orig 2014-06-05 10:44:18.914279516 +0200 | diff --git gdb/gdb_wchar.h gdb/gdb_wchar.h | ||||
| +++ gdb/gdb_wchar.h 2014-06-05 10:46:07.264279306 +0200 | index 868fe04..1311080 100644 | ||||
| @@ -56,7 +56,7 @@ | --- gdb/gdb_wchar.h | ||||
| +++ gdb/gdb_wchar.h | |||||
| @@ -59,7 +59,7 @@ | |||||
| iconvlist. */ | iconvlist. */ | ||||
| #if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \ | #if defined (HAVE_ICONV) && defined (HAVE_BTOWC) \ | ||||
| && (defined (__STDC_ISO_10646__) \ | && (defined (__STDC_ISO_10646__) \ | ||||
| - || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) | - || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) | ||||
| + || (!defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) | + || (!defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) | ||||
| #include <wchar.h> | typedef wchar_t gdb_wchar_t; | ||||
| #include <wctype.h> | typedef wint_t gdb_wint_t; | ||||
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ typedef wint_t gdb_wint_t; | ||||
| #define INTERMEDIATE_ENCODING intermediate_encoding () | #define INTERMEDIATE_ENCODING intermediate_encoding () | ||||
| const char *intermediate_encoding (void); | const char *intermediate_encoding (void); | ||||
| -#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 | -#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 | ||||
| +#elif !defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 | +#elif !defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 | ||||
| #define INTERMEDIATE_ENCODING "wchar_t" | #define INTERMEDIATE_ENCODING "wchar_t" | ||||
| #else | #else | ||||
| /* This shouldn't happen, because the earlier #if should have filtered | /* This shouldn't happen, because the earlier #if should have filtered | ||||