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

diff --git a/configure b/configure
index 176e0f9b008338af4320e5a0ed4d14d86e4f9fbc..0a2fb7a40898dce7620211cd99b50775f0179bd2 100755 (executable)
--- 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 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 eed7019c4a27bb895a71831d1f0fa784d42324eb..e9de78bbd4bcaef525ac73cc3614ef831de3f508 100644 (file)
--- 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 f98563179789a52f3e3306fc59ea48b5a2699086..a0cad5405e143e8529aa042bd871b467750084fa 100644 (file)
--- 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 3087883401e3156a3995cbff283cdcf70a13a016..eff09ba0bc5d1969e1286c6be4977f7af5a468ad 100644 (file)
--- 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 92722a1271139551782db32fdec5bbbd9e139187..6aeab3aefcad99aaa2e55cc239ab07e7264780d2 100644 (file)
--- 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,