From b5703d4357952e577c8b875fa486df22cb0ad64b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Apr 2026 22:59:20 +0200 Subject: [PATCH] Remove check for 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. --- build/cmake/setup.h.in | 3 --- configure | 26 ++------------------------ configure.ac | 16 ++-------------- include/wx/chartype.h | 4 ---- setup.h.in | 3 --- setup.h_vms | 3 --- 6 files changed, 4 insertions(+), 51 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 6d0853b1f1..fdb947a5b1 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -1043,9 +1043,6 @@ /* Define if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 -/* Define if you have (Solaris only) */ -#cmakedefine HAVE_WIDEC_H 1 - /* Define if you have the header file and iconv() symbol. */ #cmakedefine HAVE_ICONV 1 diff --git a/configure b/configure index e12afbd03c..728b78e91b 100755 --- a/configure +++ b/configure @@ -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 -#include " -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 " - fi -esac - for wx_func in putws fputws wprintf vswprintf vswscanf do @@ -33249,7 +33226,8 @@ else /* end confdefs.h. */ - $wchar_headers + #include + #include $ac_includes_default int diff --git a/configure.ac b/configure.ac index fbde11670d..61d5f4684a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -#include " -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 " - fi -esac - WX_CHECK_FUNCS(putws fputws wprintf vswprintf vswscanf,,, - [$wchar_headers]) + [#include + #include ]) dnl MinGW has a vswprintf with a different prototype, and dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS diff --git a/include/wx/chartype.h b/include/wx/chartype.h index 07e243342c..07684c891a 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -59,10 +59,6 @@ #endif #endif /* Android */ -#ifdef HAVE_WIDEC_H - #include -#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 */ diff --git a/setup.h.in b/setup.h.in index 41bc14e170..d85e9a4bfc 100644 --- a/setup.h.in +++ b/setup.h.in @@ -1042,9 +1042,6 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have (Solaris only) */ -#undef HAVE_WIDEC_H - /* Define if you have the header file and iconv() symbol. */ #undef HAVE_ICONV diff --git a/setup.h_vms b/setup.h_vms index 648354f374..73ee0be507 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -1128,9 +1128,6 @@ typedef pid_t GPid; #undef HAVE_WCTYPE_H #endif -/* Define if you have (Solaris only) */ -#undef HAVE_WIDEC_H - /* Define if you have the header file and iconv() symbol. */ #define HAVE_ICONV_H 1