From d823b15b43a73a0ef99449daeb9b167264702feb Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Thu, 11 Aug 2022 15:59:48 +1200 Subject: [PATCH 3/7] Remove configure probe for sys/select.h. is in SUSv3 (POSIX.1-2001) and every targeted Unix system has it. Provide an empty header in src/include/port/win32 so that we can #include it unguarded even on Windows. --- configure | 2 +- configure.ac | 1 - doc/src/sgml/libpq.sgml | 4 +--- src/backend/libpq/auth.c | 4 +--- src/backend/postmaster/postmaster.c | 5 +---- src/backend/tcop/postgres.c | 4 +--- src/bin/pg_basebackup/pg_basebackup.c | 4 +--- src/bin/pg_basebackup/pg_recvlogical.c | 4 +--- src/bin/pg_basebackup/receivelog.c | 4 +--- src/bin/pg_dump/parallel.c | 4 +--- src/bin/pgbench/pgbench.c | 2 -- src/fe_utils/parallel_slot.c | 2 -- src/include/pg_config.h.in | 3 --- src/include/port/win32/sys/select.h | 3 +++ src/interfaces/libpq/fe-misc.c | 4 +--- src/port/pgsleep.c | 4 +--- src/test/examples/testlibpq2.c | 4 +--- src/test/isolation/isolationtester.c | 4 +--- src/test/modules/libpq_pipeline/libpq_pipeline.c | 4 +--- src/tools/msvc/Solution.pm | 1 - 20 files changed, 17 insertions(+), 50 deletions(-) create mode 100644 src/include/port/win32/sys/select.h diff --git a/configure b/configure index b0bc818af8..804162e873 100755 --- a/configure +++ b/configure @@ -13874,7 +13874,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 net/if.h netinet/tcp.h sys/epoll.h sys/event.h sys/ipc.h sys/personality.h sys/prctl.h sys/procctl.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/signalfd.h sys/sockio.h sys/ucred.h termios.h ucred.h +for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h net/if.h netinet/tcp.h sys/epoll.h sys/event.h sys/ipc.h sys/personality.h sys/prctl.h sys/procctl.h sys/resource.h sys/sem.h sys/shm.h sys/signalfd.h sys/sockio.h sys/ucred.h termios.h ucred.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.ac b/configure.ac index 666ad7dbcb..a9474fd8f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,7 +1461,6 @@ AC_CHECK_HEADERS(m4_normalize([ sys/prctl.h sys/procctl.h sys/resource.h - sys/select.h sys/sem.h sys/shm.h sys/signalfd.h diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 74456aa69d..fab602b37e 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -9211,11 +9211,9 @@ main(int argc, char **argv) #include #include #include +#include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "libpq-fe.h" diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 2d9ab7edce..41d60e06d0 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -16,13 +16,11 @@ #include "postgres.h" #include +#include #include #include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "commands/user.h" #include "common/ip.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index a85b32db69..8a038d1b2a 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -77,10 +78,6 @@ #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif - #ifdef USE_BONJOUR #include #endif diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 11e802eba9..671edcb3c7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -23,10 +23,8 @@ #include #include #include -#include -#ifdef HAVE_SYS_SELECT_H #include -#endif +#include #ifdef HAVE_SYS_RESOURCE_H #include #include diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 49fcabbd2c..9ce30d43a4 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -16,13 +16,11 @@ #include #include #include +#include #include #include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #ifdef HAVE_LIBZ #include #endif diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index b59ff23f61..2a4c8b130a 100644 --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -14,11 +14,9 @@ #include #include +#include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "access/xlog_internal.h" #include "common/fe_memutils.h" diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index ad866a7602..976d1e73b1 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -14,11 +14,9 @@ #include "postgres_fe.h" +#include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "access/xlog_internal.h" #include "common/file_utils.h" diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index c9f6b86bb0..c8a70d9bc1 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -53,14 +53,12 @@ #include "postgres_fe.h" #ifndef WIN32 +#include #include #include #include #include #endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "fe_utils/string_utils.h" #include "parallel.h" diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 0778656794..45606e944d 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -52,10 +52,8 @@ #endif #else /* no ppoll(), so use select() */ #define POLL_USING_SELECT -#ifdef HAVE_SYS_SELECT_H #include #endif -#endif #include "common/int.h" #include "common/logging.h" diff --git a/src/fe_utils/parallel_slot.c b/src/fe_utils/parallel_slot.c index 684327885d..8bce8ca366 100644 --- a/src/fe_utils/parallel_slot.c +++ b/src/fe_utils/parallel_slot.c @@ -18,9 +18,7 @@ #include "postgres_fe.h" -#ifdef HAVE_SYS_SELECT_H #include -#endif #include "common/logging.h" #include "fe_utils/cancel.h" diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index b6c73ccd71..f666b4173b 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -511,9 +511,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SEM_H diff --git a/src/include/port/win32/sys/select.h b/src/include/port/win32/sys/select.h new file mode 100644 index 0000000000..f8a877accd --- /dev/null +++ b/src/include/port/win32/sys/select.h @@ -0,0 +1,3 @@ +/* + * src/include/port/win32/sys/select.h + */ diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index d76bb3957a..795500c593 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -37,15 +37,13 @@ #include "win32.h" #else #include +#include #include #endif #ifdef HAVE_POLL_H #include #endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "libpq-fe.h" #include "libpq-int.h" diff --git a/src/port/pgsleep.c b/src/port/pgsleep.c index a84e6ccb38..03f0fac07b 100644 --- a/src/port/pgsleep.c +++ b/src/port/pgsleep.c @@ -13,10 +13,8 @@ #include "c.h" #include -#include -#ifdef HAVE_SYS_SELECT_H #include -#endif +#include /* * In a Windows backend, we don't use this implementation, but rather diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c index 6337b315a4..05ce8c3f13 100644 --- a/src/test/examples/testlibpq2.c +++ b/src/test/examples/testlibpq2.c @@ -32,11 +32,9 @@ #include #include #include +#include #include #include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include "libpq-fe.h" diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 095db8f35c..0a66235153 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -7,10 +7,8 @@ #include "postgres_fe.h" -#include -#ifdef HAVE_SYS_SELECT_H #include -#endif +#include #include "datatype/timestamp.h" #include "isolationtester.h" diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index dc17898a61..0407c4a8c0 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -15,10 +15,8 @@ #include "postgres_fe.h" -#include -#ifdef HAVE_SYS_SELECT_H #include -#endif +#include #include "catalog/pg_type_d.h" #include "common/fe_memutils.h" diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index ed437ce084..b552f439cc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -366,7 +366,6 @@ sub GenerateFiles HAVE_SYS_PRCTL_H => undef, HAVE_SYS_PROCCTL_H => undef, HAVE_SYS_RESOURCE_H => undef, - HAVE_SYS_SELECT_H => undef, HAVE_SYS_SEM_H => undef, HAVE_SYS_SHM_H => undef, HAVE_SYS_SIGNALFD_H => undef, -- 2.32.1 (Apple Git-133)