From 97cf1fa4ed57cc1ed556ac4f827e7df8538f2d29 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 21 Feb 2020 14:11:39 -0500 Subject: [PATCH] Assume that we have . Windows has this, and so do all other live platforms according to the buildfarm; it's been required by POSIX since SUSv2. So remove the configure probe and tests of HAVE_WCHAR_H. This is part of a series of commits to get rid of no-longer-relevant configure checks and dead src/port/ code. I'm committing them separately to make it easier to back out individual changes if they prove less portable than I expect. Discussion: https://postgr.es/m/15379.1582221614@sss.pgh.pa.us --- configure | 2 +- configure.in | 1 - src/backend/utils/adt/formatting.c | 4 +--- src/include/pg_config.h.in | 3 --- src/include/regex/regcustom.h | 4 +--- src/include/tsearch/ts_locale.h | 4 +--- src/tools/msvc/Solution.pm | 1 - 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/configure b/configure index e6e8275e80..610812d103 100755 --- a/configure +++ b/configure @@ -12762,7 +12762,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h fi -for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h wchar.h wctype.h +for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h wctype.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/configure.in b/configure.in index e8e972231c..8d7871a59a 100644 --- a/configure.in +++ b/configure.in @@ -1300,7 +1300,6 @@ AC_CHECK_HEADERS(m4_normalize([ sys/un.h termios.h ucred.h - wchar.h wctype.h ])) diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index f58331de75..d0294684e2 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -72,11 +72,9 @@ /* * towlower() and friends should be in , but some pre-C99 systems - * declare them in . + * declare them in , so include that too. */ -#ifdef HAVE_WCHAR_H #include -#endif #ifdef HAVE_WCTYPE_H #include #endif diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 20700cb85a..ddc4a3f816 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -677,9 +677,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UUID_UUID_H -/* Define to 1 if you have the header file. */ -#undef HAVE_WCHAR_H - /* Define to 1 if you have the `wcstombs_l' function. */ #undef HAVE_WCSTOMBS_L diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h index 82c9e2fad8..100c52d640 100644 --- a/src/include/regex/regcustom.h +++ b/src/include/regex/regcustom.h @@ -43,11 +43,9 @@ /* * towlower() and friends should be in , but some pre-C99 systems - * declare them in . + * declare them in , so include that too. */ -#ifdef HAVE_WCHAR_H #include -#endif #ifdef HAVE_WCTYPE_H #include #endif diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h index 17536babfe..cc4bd9ab20 100644 --- a/src/include/tsearch/ts_locale.h +++ b/src/include/tsearch/ts_locale.h @@ -20,11 +20,9 @@ /* * towlower() and friends should be in , but some pre-C99 systems - * declare them in . + * declare them in , so include that too. */ -#ifdef HAVE_WCHAR_H #include -#endif #ifdef HAVE_WCTYPE_H #include #endif diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 151a41ad5b..b15dae16a9 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -396,7 +396,6 @@ sub GenerateFiles HAVE_UUID_H => undef, HAVE_UUID_UUID_H => undef, HAVE_WINLDAP_H => undef, - HAVE_WCHAR_H => 1, HAVE_WCSTOMBS_L => 1, HAVE_WCTYPE_H => 1, HAVE_X509_GET_SIGNATURE_NID => 1,