From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4324 invoked by alias); 23 Mar 2009 17:47:57 -0000 Received: (qmail 4314 invoked by uid 22791); 23 Mar 2009 17:47:56 -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 17:47:50 +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 n2NHlkWZ009229; Mon, 23 Mar 2009 13:47:46 -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 n2NHlfkg005123; Mon, 23 Mar 2009 13:47:41 -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 n2NHlj4N015222; Mon, 23 Mar 2009 13:47:46 -0400 Received: by opsy.redhat.com (Postfix, from userid 500) id 237E53782B4; Mon, 23 Mar 2009 11:47:44 -0600 (MDT) To: "Pierre Muller" Cc: Subject: FYI: fix charset.c build failure References: <000f01c9abcd$6b0e8990$412b9cb0$@u-strasbg.fr> <001901c9abda$f0f0e870$d2d2b950$@u-strasbg.fr> From: Tom Tromey Reply-To: Tom Tromey Date: Mon, 23 Mar 2009 17:54:00 -0000 In-Reply-To: <001901c9abda$f0f0e870$d2d2b950$@u-strasbg.fr> (Pierre Muller's message of "Mon\, 23 Mar 2009 18\:15\:18 +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/msg00501.txt.bz2 >>>>> "Pierre" == Pierre Muller writes: Pierre> Yes, it fixes the compilation failure for me, Pierre> thanks for the fact reaction. Thanks. Here's the patch I am committing, with a ChangeLog entry. Tom 2009-03-23 Tom Tromey * charset.c (ICONV_CONST) : Define. (iconv): Make 'inbuf' argument const. (convert_between_encodings): Use ICONV_CONST. (wchar_iterate): Likewise. Index: charset.c =================================================================== RCS file: /cvs/src/src/gdb/charset.c,v retrieving revision 1.17 diff -u -r1.17 charset.c --- charset.c 20 Mar 2009 23:04:30 -0000 1.17 +++ charset.c 23 Mar 2009 17:32:00 -0000 @@ -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 @@ } 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 @@ 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 @@ 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) { Index: dwarf2expr.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2expr.c,v retrieving revision 1.29 diff -u -r1.29 dwarf2expr.c --- dwarf2expr.c 3 Jan 2009 05:57:51 -0000 1.29 +++ dwarf2expr.c 23 Mar 2009 17:32:00 -0000 @@ -746,7 +746,7 @@ case DW_OP_GNU_uninit: if (op_ptr != op_end) - error (_("DWARF-2 expression error: DW_OP_GNU_unint must always " + error (_("DWARF-2 expression error: DW_OP_GNU_uninit must always " "be the very last op.")); ctx->initialized = 0;