diff options
| author | Thomas Munro | 2022-08-18 04:11:58 +0000 |
|---|---|---|
| committer | Thomas Munro | 2022-08-18 04:31:11 +0000 |
| commit | 2f8d918359ccb34533690735eb46b851002ac698 (patch) | |
| tree | 9fd82b46445483607e3fc44cbe0addb60e1e7aae | |
| parent | a717cddcac518162cc17bae3c68a492db9ab2e75 (diff) | |
Remove configure probe for net/if.h.
<net/if.h> is in SUSv3 and all targeted Unixes have it. It's used in a
region that is already ifdef'd out for Windows. We're not using it for
any standard definitions, but it's where AIX defines conventional socket
ioctl numbers.
Discussion: https://postgr.es/m/CA+hUKGKErNfhmvb_H0UprEmp4LPzGN06yR2_0tYikjzB-2ECMw@mail.gmail.com
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/backend/libpq/ifaddr.c | 3 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 1 |
5 files changed, 1 insertions, 9 deletions
@@ -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 net/if.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 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 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 eed7019c4a..e9de78bbd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1450,7 +1450,6 @@ AC_CHECK_HEADERS(m4_normalize([ ifaddrs.h langinfo.h mbarrier.h - net/if.h netinet/tcp.h sys/epoll.h sys/event.h diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c index f985631797..a0cad5405e 100644 --- a/src/backend/libpq/ifaddr.c +++ b/src/backend/libpq/ifaddr.c @@ -323,10 +323,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) #else /* !HAVE_GETIFADDRS && !WIN32 */ #include <sys/ioctl.h> - -#ifdef HAVE_NET_IF_H #include <net/if.h> -#endif #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 3087883401..eff09ba0bc 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -325,9 +325,6 @@ /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H -/* Define to 1 if you have the <net/if.h> header file. */ -#undef HAVE_NET_IF_H - /* Define to 1 if you have the `OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 92722a1271..6aeab3aefc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -305,7 +305,6 @@ sub GenerateFiles HAVE_MEMSET_S => undef, HAVE_MKDTEMP => undef, HAVE_NETINET_TCP_H => undef, - HAVE_NET_IF_H => undef, HAVE_OPENSSL_INIT_SSL => undef, HAVE_OSSP_UUID_H => undef, HAVE_PAM_PAM_APPL_H => undef, |