aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-02-21 14:11:39 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2020-02-21 14:30:47 -0500
commit97cf1fa4ed57cc1ed556ac4f827e7df8538f2d29 (patch)
tree9112a1fb86ed3589762c8615ad24574b68449e98
parent481c8e9232386e289fbd3e8f75893ae8d9814298 (diff)
downloadpostgresql-97cf1fa4ed57cc1ed556ac4f827e7df8538f2d29.tar.gz
postgresql-97cf1fa4ed57cc1ed556ac4f827e7df8538f2d29.zip
Assume that we have <wchar.h>.
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
-rwxr-xr-xconfigure2
-rw-r--r--configure.in1
-rw-r--r--src/backend/utils/adt/formatting.c4
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/include/regex/regcustom.h4
-rw-r--r--src/include/tsearch/ts_locale.h4
-rw-r--r--src/tools/msvc/Solution.pm1
7 files changed, 4 insertions, 15 deletions
diff --git a/configure b/configure
index e6e8275e807..610812d1039 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 e8e972231c2..8d7871a59a5 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 f58331de75b..d0294684e25 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 <wctype.h>, but some pre-C99 systems
- * declare them in <wchar.h>.
+ * declare them in <wchar.h>, so include that too.
*/
-#ifdef HAVE_WCHAR_H
#include <wchar.h>
-#endif
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#endif
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 20700cb85a9..ddc4a3f816a 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 <uuid/uuid.h> header file. */
#undef HAVE_UUID_UUID_H
-/* Define to 1 if you have the <wchar.h> 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 82c9e2fad81..100c52d640f 100644
--- a/src/include/regex/regcustom.h
+++ b/src/include/regex/regcustom.h
@@ -43,11 +43,9 @@
/*
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
- * declare them in <wchar.h>.
+ * declare them in <wchar.h>, so include that too.
*/
-#ifdef HAVE_WCHAR_H
#include <wchar.h>
-#endif
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#endif
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index 17536babfe0..cc4bd9ab20d 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 <wctype.h>, but some pre-C99 systems
- * declare them in <wchar.h>.
+ * declare them in <wchar.h>, so include that too.
*/
-#ifdef HAVE_WCHAR_H
#include <wchar.h>
-#endif
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#endif
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 151a41ad5b6..b15dae16a9e 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,