summaryrefslogtreecommitdiff
path: root/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
diff options
context:
space:
mode:
Diffstat (limited to 'macros/texinfo/texinfo/gnulib/m4/wcwidth.m4')
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/wcwidth.m434
1 files changed, 9 insertions, 25 deletions
diff --git a/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4 b/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
index e9b5bf48fc..2ac2a5148a 100644
--- a/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
@@ -1,5 +1,5 @@
-# wcwidth.m4 serial 29
-dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
+# wcwidth.m4 serial 34
+dnl Copyright (C) 2006-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -19,17 +19,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
AC_CHECK_FUNCS_ONCE([wcwidth])
AC_CHECK_DECLS([wcwidth], [], [], [[
-/* AIX 3.2.5 declares wcwidth in <string.h>. */
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
- before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-]])
+ #include <wchar.h>
+ ]])
if test $ac_cv_have_decl_wcwidth != yes; then
HAVE_DECL_WCWIDTH=0
fi
@@ -50,8 +41,10 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then
HAVE_WCWIDTH=1
dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
- dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
- dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+ dnl On NetBSD 9.0, OpenBSD 5.0, MidnightBSD 1.1,
+ dnl wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
+ dnl On NetBSD 9.0, MidnightBSD 1.1, OSF/1 5.1,
+ dnl wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
dnl This leads to bugs in 'ls' (coreutils).
dnl On Solaris 11.4, wcwidth(0x2202) (PARTIAL DIFFERENTIAL) returns 2,
@@ -62,15 +55,6 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <locale.h>
-/* AIX 3.2.5 declares wcwidth in <string.h>. */
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
- before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
#include <wchar.h>
#if !HAVE_DECL_WCWIDTH
extern
@@ -108,7 +92,7 @@ changequote(,)dnl
*-musl*) gl_cv_func_wcwidth_works="guessing yes";;
# Guess yes on AIX 7 systems.
aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ *) gl_cv_func_wcwidth_works="$gl_cross_guess_normal";;
esac
changequote([,])dnl
])