From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29513 invoked by alias); 3 Mar 2003 02:35:40 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 29506 invoked from network); 3 Mar 2003 02:35:40 -0000 Received: from unknown (HELO mx1.redhat.com) (172.16.49.200) by 172.16.49.205 with SMTP; 3 Mar 2003 02:35:40 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id h232Zeq30086 for ; Sun, 2 Mar 2003 21:35:40 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id h232ZdV32450 for ; Sun, 2 Mar 2003 21:35:39 -0500 Received: from localhost.redhat.com (romulus-int.sfbay.redhat.com [172.16.27.46]) by pobox.corp.redhat.com (8.11.6/8.11.6) with ESMTP id h232ZdC32748 for ; Sun, 2 Mar 2003 21:35:39 -0500 Received: by localhost.redhat.com (Postfix, from userid 469) id BCB99FF7A; Sun, 2 Mar 2003 21:39:40 -0500 (EST) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15970.49260.386319.155222@localhost.redhat.com> Date: Mon, 03 Mar 2003 02:35:00 -0000 To: Joel Brobecker Cc: gdb-patches@sources.redhat.com Subject: Re: Missing check for mbsrtowc causes compilation failure on HP/UX 11.11 In-Reply-To: <20030128050444.GI6437@gnat.com> References: <20030128050317.GH6437@gnat.com> <20030128050444.GI6437@gnat.com> X-SW-Source: 2003-03/txt/msg00041.txt.bz2 Joel, feel free to commit this to the gdb copy of readline. Just make sure you add the changelog entry only to the ChangeLog.gdb file. elena Joel Brobecker writes: > > The patch is attached. > > Sigh... With the patch, this time. Sorry. > > > Changelog: > > > > aclocal.m4 > > - add check for mbsrtowc. > > > > config.h.in > > - regenerate. > > > > rlmbutil.h > > - make sure mbsrtowc is available before enabling multibyte support. > > -- > Joel > diff -cp ../../gdb-public.orig/readline/aclocal.m4 ./aclocal.m4 > *** ../../gdb-public.orig/readline/aclocal.m4 Fri Dec 13 08:55:58 2002 > --- ./aclocal.m4 Mon Jan 27 12:42:10 2003 > *************** AC_CHECK_HEADERS(wctype.h) > *** 1652,1657 **** > --- 1652,1658 ---- > AC_CHECK_HEADERS(wchar.h) > AC_CHECK_HEADERS(langinfo.h) > > + AC_CHECK_FUNC(mbsrtowc, AC_DEFINE(HAVE_MBSRTOWC)) > AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) > AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) > > diff -cp ../../gdb-public.orig/readline/config.h.in ./config.h.in > *** ../../gdb-public.orig/readline/config.h.in Fri Dec 13 08:55:59 2002 > --- ./config.h.in Mon Jan 27 12:43:22 2003 > *************** > *** 31,36 **** > --- 31,39 ---- > /* Define if you have the lstat function. */ > #undef HAVE_LSTAT > > + /* Define if you have the mbsrtowc function. */ > + #undef HAVE_MBSRTOWC > + > /* Define if you have the mbsrtowcs function. */ > #undef HAVE_MBSRTOWCS > > diff -cp ../../gdb-public.orig/readline/rlmbutil.h ./rlmbutil.h > *** ../../gdb-public.orig/readline/rlmbutil.h Sun Dec 8 17:31:37 2002 > --- ./rlmbutil.h Mon Jan 27 23:22:15 2003 > *************** > *** 35,41 **** > #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) > # include > # include > ! # if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ > # define HANDLE_MULTIBYTE 1 > # endif > #endif > --- 35,42 ---- > #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) > # include > # include > ! # if defined (HAVE_MBSRTOWC) && defined (HAVE_MBSRTOWCS) > ! /* system is supposed to support XPG5 */ > # define HANDLE_MULTIBYTE 1 > # endif > #endif