From 2bd020439ad63aa78333cf0e66f6b8ca0b63685c Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sat, 12 Apr 2003 18:07:06 +0000 Subject: configure.in: Check for wchar.h, mbstowcs, and wcswidth. * configure.in: Check for wchar.h, mbstowcs, and wcswidth. * configure, config.in: Regenerate. * intl.c (gcc_gettext_width): New function. * intl.h: Prototype it. cp: * call.c (print_z_candidates): Use gcc_gettext_width, not strlen, to determine how much padding to use. From-SVN: r65517 --- gcc/intl.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gcc/intl.c') diff --git a/gcc/intl.c b/gcc/intl.c index 958e77a..5a885bf 100644 --- a/gcc/intl.c +++ b/gcc/intl.c @@ -45,4 +45,35 @@ gcc_init_libintl () (void) textdomain ("gcc"); } +#if defined HAVE_WCHAR_H && defined HAVE_MBSTOWCS && defined HAVE_WCSWIDTH +#include + +/* Returns the width in columns of MSGSTR, which came from gettext. + This is for indenting subsequent output. */ + +size_t +gcc_gettext_width (msgstr) + const char *msgstr; +{ + size_t nwcs = mbstowcs (0, msgstr, 0); + wchar_t *wmsgstr = alloca ((nwcs + 1) * sizeof (wchar_t)); + + mbstowcs (wmsgstr, msgstr, nwcs + 1); + return wcswidth (wmsgstr, nwcs); +} + +#else /* no wcswidth */ + +/* We don't have any way of knowing how wide the string is. Guess + the length of the string. */ + +size_t +gcc_gettext_width (msgstr) + const char *msgstr; +{ + return strlen (msgstr); +} + #endif + +#endif /* ENABLE_NLS */ -- cgit v1.1