Remove check for <widec.h> from configure and HAVE_WIDEC_H

The check for this pre-C99 Solaris header was added back in a49ffb32e2
(include widec.h if it's available, it contains declarations of
[f]putws() under Solaris, 2006-11-09) and shouldn't be needed any more.

CMake never checked for it, so remove the check from configure too and
then remove the now never defined HAVE_WIDEC_H.
This commit is contained in:
Vadim Zeitlin
2026-04-07 23:21:57 +02:00
parent 96ae1fb978
commit b5703d4357
6 changed files with 4 additions and 51 deletions
-3
View File
@@ -1043,9 +1043,6 @@
/* Define if you have the <unistd.h> header file. */
#cmakedefine HAVE_UNISTD_H 1
/* Define if you have <widec.h> (Solaris only) */
#cmakedefine HAVE_WIDEC_H 1
/* Define if you have the <iconv.h> header file and iconv() symbol. */
#cmakedefine HAVE_ICONV 1
Vendored
+2 -24
View File
@@ -33213,29 +33213,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
wchar_headers="#include <stdio.h>
#include <wchar.h>"
case "${host}" in
*-*-solaris2* )
for ac_header in widec.h
do :
ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default
"
if test "x$ac_cv_header_widec_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_WIDEC_H 1
_ACEOF
fi
done
if test "$ac_cv_header_widec_h" = "yes"; then
wchar_headers="$wchar_headers
#include <widec.h>"
fi
esac
for wx_func in putws fputws wprintf vswprintf vswscanf
do
@@ -33249,7 +33226,8 @@ else
/* end confdefs.h. */
$wchar_headers
#include <stdio.h>
#include <wchar.h>
$ac_includes_default
int
+2 -14
View File
@@ -4040,21 +4040,9 @@ if test "$wx_cv_func_vsscanf" = "yes"; then
fi
AC_LANG_POP()
dnl also look if we have wide char IO functions, notice that [f]putws are
dnl declared in special widec.h under Solaris
wchar_headers="#include <stdio.h>
#include <wchar.h>"
case "${host}" in
*-*-solaris2* )
AC_CHECK_HEADERS(widec.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_widec_h" = "yes"; then
wchar_headers="$wchar_headers
#include <widec.h>"
fi
esac
WX_CHECK_FUNCS(putws fputws wprintf vswprintf vswscanf,,,
[$wchar_headers])
[#include <stdio.h>
#include <wchar.h>])
dnl MinGW has a vswprintf with a different prototype, and
dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
-4
View File
@@ -59,10 +59,6 @@
#endif
#endif /* Android */
#ifdef HAVE_WIDEC_H
#include <widec.h>
#endif
/* -------------------------------------------------------------------------- */
/* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */
/* mapped to either char or wchar_t depending on the ASCII/Unicode mode and */
-3
View File
@@ -1042,9 +1042,6 @@
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have <widec.h> (Solaris only) */
#undef HAVE_WIDEC_H
/* Define if you have the <iconv.h> header file and iconv() symbol. */
#undef HAVE_ICONV
-3
View File
@@ -1128,9 +1128,6 @@ typedef pid_t GPid;
#undef HAVE_WCTYPE_H
#endif
/* Define if you have <widec.h> (Solaris only) */
#undef HAVE_WIDEC_H
/* Define if you have the <iconv.h> header file and iconv() symbol. */
#define HAVE_ICONV_H 1