From d95e2533c0bdea3d1346879f31fb1718fc1f27cc Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Mon, 15 Aug 2022 16:28:28 +1200 Subject: [PATCH 5/6] Remove configure probe for netinet/tcp.h. is in SUSv3 and all targeted Unix systems have it. For Windows, we can provide a stub include file, to avoid some #ifdef noise. --- configure | 2 +- configure.ac | 1 - src/backend/libpq/be-secure-openssl.c | 2 -- src/backend/libpq/be-secure.c | 2 -- src/backend/libpq/ifaddr.c | 2 -- src/backend/libpq/pqcomm.c | 2 -- src/common/ip.c | 2 -- src/include/libpq/libpq-be.h | 2 -- src/include/pg_config.h.in | 3 --- src/include/port/win32/netinet/tcp.h | 3 +++ src/interfaces/libpq/fe-connect.c | 2 -- src/interfaces/libpq/fe-protocol3.c | 2 -- src/interfaces/libpq/fe-secure-openssl.c | 2 -- src/interfaces/libpq/fe-secure.c | 2 -- src/tools/msvc/Solution.pm | 1 - 15 files changed, 4 insertions(+), 26 deletions(-) create mode 100644 src/include/port/win32/netinet/tcp.h diff --git a/configure b/configure index dd27cc4f85..554348c413 100755 --- a/configure +++ b/configure @@ -13761,7 +13761,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 netinet/tcp.h sys/epoll.h sys/event.h sys/personality.h sys/prctl.h sys/procctl.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 sys/epoll.h sys/event.h sys/personality.h sys/prctl.h sys/procctl.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 d04372e29d..e17f54d1e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1450,7 +1450,6 @@ AC_CHECK_HEADERS(m4_normalize([ ifaddrs.h langinfo.h mbarrier.h - netinet/tcp.h sys/epoll.h sys/event.h sys/personality.h diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 9cec6866a3..55d4b29f7e 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -24,10 +24,8 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include #include -#endif #include "libpq/libpq.h" #include "miscadmin.h" diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index a05f67afb5..e3e54713e8 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -24,10 +24,8 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include #include -#endif #include "libpq/libpq.h" #include "miscadmin.h" diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c index eb4de5ec2f..18e70741d7 100644 --- a/src/backend/libpq/ifaddr.c +++ b/src/backend/libpq/ifaddr.c @@ -24,9 +24,7 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include -#endif #include #include "libpq/ifaddr.h" diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index f7ba2fc5f5..3352ddb23b 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -67,9 +67,7 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include -#endif #include #ifdef _MSC_VER /* mstcpip.h is missing on mingw */ #include diff --git a/src/common/ip.c b/src/common/ip.c index dd9193feb1..0149d07ae7 100644 --- a/src/common/ip.c +++ b/src/common/ip.c @@ -28,9 +28,7 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include -#endif #include #include diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index fa2fd03009..32d3a4b085 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -23,9 +23,7 @@ #include #include #endif -#ifdef HAVE_NETINET_TCP_H #include -#endif #ifdef ENABLE_GSS #if defined(HAVE_GSSAPI_H) diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 4a2914a780..1ae65cfe81 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -319,9 +319,6 @@ /* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_TCP_H - /* Define to 1 if you have the `OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL diff --git a/src/include/port/win32/netinet/tcp.h b/src/include/port/win32/netinet/tcp.h new file mode 100644 index 0000000000..c1b5062674 --- /dev/null +++ b/src/include/port/win32/netinet/tcp.h @@ -0,0 +1,3 @@ +/* src/include/port/win32/netinet/tcp.h */ + +#include diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 0dcce48888..36aabeef65 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -51,10 +51,8 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include #endif -#endif #ifdef ENABLE_THREAD_SAFETY #ifdef WIN32 diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c index f267dfd33c..bbfb55542d 100644 --- a/src/interfaces/libpq/fe-protocol3.c +++ b/src/interfaces/libpq/fe-protocol3.c @@ -21,10 +21,8 @@ #include "win32.h" #else #include -#ifdef HAVE_NETINET_TCP_H #include #endif -#endif #include "libpq-fe.h" #include "libpq-int.h" diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 8117cbd40f..29a575588e 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -38,9 +38,7 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include -#endif #include #endif diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index a1dc7b796d..3df4a97f2e 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -29,9 +29,7 @@ #include #include #include -#ifdef HAVE_NETINET_TCP_H #include -#endif #include #endif diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 26217e6d19..d80efbd95c 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -303,7 +303,6 @@ sub GenerateFiles HAVE_MEMORY_H => 1, HAVE_MEMSET_S => undef, HAVE_MKDTEMP => undef, - HAVE_NETINET_TCP_H => undef, HAVE_OPENSSL_INIT_SSL => undef, HAVE_OSSP_UUID_H => undef, HAVE_PAM_PAM_APPL_H => undef, -- 2.35.1