This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: Missing check for mbsrtowc causes compilation failure on HP/UX 11.11
- From: Elena Zannoni <ezannoni at redhat dot com>
- To: Joel Brobecker <brobecker at gnat dot com>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Sun, 2 Mar 2003 21:39:40 -0500
- Subject: Re: Missing check for mbsrtowc causes compilation failure on HP/UX 11.11
- References: <20030128050317.GH6437@gnat.com><20030128050444.GI6437@gnat.com>
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 <wchar.h>
> # include <wctype.h>
> ! # 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 <wchar.h>
> # include <wctype.h>
> ! # if defined (HAVE_MBSRTOWC) && defined (HAVE_MBSRTOWCS)
> ! /* system is supposed to support XPG5 */
> # define HANDLE_MULTIBYTE 1
> # endif
> #endif