1 --- a/m4/gnulib-comp.m4
2 +++ b/m4/gnulib-comp.m4
3 @@ -2671,7 +2671,7 @@ changequote([, ])dnl
5 gl_SYS_SOCKET_MODULE_INDICATOR([socket])
6 AC_REQUIRE([gt_TYPE_WCHAR_T])
7 - AC_REQUIRE([gt_TYPE_WINT_T])
8 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
10 AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
11 AC_LIBOBJ([strerror_r])
14 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
15 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
17 AC_REQUIRE([gl_LIMITS_H])
18 - AC_REQUIRE([gt_TYPE_WINT_T])
19 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
21 dnl For backward compatibility. Some packages may still be testing these
23 --- a/m4/vasnprintf.m4
24 +++ b/m4/vasnprintf.m4
25 @@ -33,7 +33,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
26 AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
28 AC_REQUIRE([gt_TYPE_WCHAR_T])
29 - AC_REQUIRE([gt_TYPE_WINT_T])
30 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
33 # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
34 @@ -41,7 +41,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
36 AC_REQUIRE([gl_FEATURES_H])
37 AC_REQUIRE([gt_TYPE_WCHAR_T])
38 - AC_REQUIRE([gt_TYPE_WINT_T])
39 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
40 AC_REQUIRE([AC_TYPE_SIZE_T])
41 AC_CHECK_TYPE([ptrdiff_t], ,
42 [AC_DEFINE([ptrdiff_t], [long],
43 @@ -55,7 +55,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
45 AC_REQUIRE([AC_FUNC_ALLOCA])
46 AC_REQUIRE([gt_TYPE_WCHAR_T])
47 - AC_REQUIRE([gt_TYPE_WINT_T])
48 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
49 AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
50 dnl Use the _snprintf function only if it is declared (because on NetBSD it
51 dnl is defined as a weak alias of snprintf; we prefer to use the latter).
54 @@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
56 AC_REQUIRE([gl_FEATURES_H])
58 - AC_REQUIRE([gt_TYPE_WINT_T])
59 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
60 if test $gt_cv_c_wint_t = yes; then
65 @@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
67 AC_SUBST([HAVE_ISWCNTRL])
69 - AC_REQUIRE([gt_TYPE_WINT_T])
70 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
71 if test $gt_cv_c_wint_t = yes; then
76 @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
77 AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
79 AC_REQUIRE([gt_TYPE_WCHAR_T])
80 - AC_REQUIRE([gt_TYPE_WINT_T])
81 + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
83 AC_CHECK_HEADERS_ONCE([wchar.h])
84 AC_CHECK_FUNCS_ONCE([wcwidth])
87 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
88 dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
89 dnl Prerequisite: AC_PROG_CC
91 -AC_DEFUN([gt_TYPE_WINT_T],
92 +AC_DEFUN([gt_TYPE_WINT_T_GNUTLS],
94 AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],