From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8742 invoked by alias); 23 Mar 2009 16:04:30 -0000 Received: (qmail 8156 invoked by uid 22791); 23 Mar 2009 16:04:27 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 23 Mar 2009 16:04:20 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2NG4HGd016745; Mon, 23 Mar 2009 12:04:17 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n2NG4B52004541; Mon, 23 Mar 2009 12:04:12 -0400 Received: from opsy.redhat.com (vpn-12-142.rdu.redhat.com [10.11.12.142]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n2NG4FZW020108; Mon, 23 Mar 2009 12:04:16 -0400 Received: by opsy.redhat.com (Postfix, from userid 500) id 08ABC3782B4; Mon, 23 Mar 2009 10:04:13 -0600 (MDT) To: "Pierre Muller" Cc: Subject: Re: [Build failure] chartset.c build failure: iconv 2nd argument type problem References: <000f01c9abcd$6b0e8990$412b9cb0$@u-strasbg.fr> From: Tom Tromey Reply-To: Tom Tromey Date: Mon, 23 Mar 2009 16:10:00 -0000 In-Reply-To: <000f01c9abcd$6b0e8990$412b9cb0$@u-strasbg.fr> (Pierre Muller's message of "Mon\, 23 Mar 2009 16\:38\:30 +0100") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-03/txt/msg00493.txt.bz2 >>>>> "Pierre" == Pierre Muller writes: Pierre> On cygwin, the current iconv function has a (const char **) Pierre> type for the second argument, whereas other implementations Pierre> seem to be using (char **) type. Oops, I'm sorry about breaking the build for you. Pierre> Tom, could you please take a look at this? Please try the appended patch. If this works for you, I will check it in. Tom diff --git a/gdb/charset.c b/gdb/charset.c index 5efb849..3c56613 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -86,6 +86,9 @@ #undef iconv #undef iconv_close +#undef ICONV_CONST +#define ICONV_CONST const + iconv_t iconv_open (const char *to, const char *from) { @@ -109,7 +112,7 @@ iconv_close (iconv_t arg) } size_t -iconv (iconv_t ucs_flag, char **inbuf, size_t *inbytesleft, +iconv (iconv_t ucs_flag, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { if (ucs_flag) @@ -440,7 +443,7 @@ convert_between_encodings (const char *from, const char *to, outp = obstack_base (output) + old_size; outleft = space_request; - r = iconv (desc, &inp, &inleft, &outp, &outleft); + r = iconv (desc, (ICONV_CONST char **) &inp, &inleft, &outp, &outleft); /* Now make sure that the object on the obstack only includes bytes we have converted. */ @@ -580,7 +583,8 @@ wchar_iterate (struct wchar_iterator *iter, size_t num; gdb_wchar_t result; - size_t r = iconv (iter->desc, (char **) &iter->input, &iter->bytes, + size_t r = iconv (iter->desc, + (ICONV_CONST char **) &iter->input, &iter->bytes, &outptr, &out_avail); if (r == (size_t) -1) {