diff options
| author | Tom Tromey <tromey@redhat.com> | 2010-09-15 20:18:47 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2010-09-15 20:18:47 +0000 |
| commit | 62234ccc1e274257cbbc59de20f6fa7a7f148c5a (patch) | |
| tree | 0f53497cbc79cfda370be30bc8baba0e495ef5ee /gdb/charset.c | |
| parent | d3fe237dc19afffad090e06ccb75f46dfa263091 (diff) | |
| download | gdb-62234ccc1e274257cbbc59de20f6fa7a7f148c5a.zip gdb-62234ccc1e274257cbbc59de20f6fa7a7f148c5a.tar.gz gdb-62234ccc1e274257cbbc59de20f6fa7a7f148c5a.tar.bz2 | |
* charset.c (iconv_open): New define.
(iconv): Likewise.
(iconv_close): Likewise.
(phony_iconv_open): Add "phony_" prefix.
(phony_iconv_close): Likewise.
(phony_iconv): Likewise.
* gdb_wchar.h: Check _LIBICONV_VERSION, __STDC_ISO_10646__.
Change how INTERMEDIATE_ENCODING is defined.
Diffstat (limited to 'gdb/charset.c')
| -rw-r--r-- | gdb/charset.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gdb/charset.c b/gdb/charset.c index 43b7fa8..3274219 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -90,8 +90,11 @@ #undef iconv_t #define iconv_t int #undef iconv_open +#define iconv_open phony_iconv_open #undef iconv +#define iconv phony_iconv #undef iconv_close +#define iconv_close phony_iconv_close #undef ICONV_CONST #define ICONV_CONST const @@ -106,7 +109,7 @@ #endif iconv_t -iconv_open (const char *to, const char *from) +phony_iconv_open (const char *to, const char *from) { /* We allow conversions from UTF-32BE, wchar_t, and the host charset. We allow conversions to wchar_t and the host charset. */ @@ -122,14 +125,14 @@ iconv_open (const char *to, const char *from) } int -iconv_close (iconv_t arg) +phony_iconv_close (iconv_t arg) { return 0; } size_t -iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) +phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) { if (utf_flag) { |