Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2f8d918

Browse files
committed
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
1 parent a717cdd commit 2f8d918

File tree

5 files changed

+1
-9
lines changed

5 files changed

+1
-9
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -13761,7 +13761,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
1376113761
fi
1376213762

1376313763

13764-
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
13764+
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
1376513765
do :
1376613766
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1376713767
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

configure.ac

-1
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,6 @@ AC_CHECK_HEADERS(m4_normalize([
14501450
ifaddrs.h
14511451
langinfo.h
14521452
mbarrier.h
1453-
net/if.h
14541453
netinet/tcp.h
14551454
sys/epoll.h
14561455
sys/event.h

src/backend/libpq/ifaddr.c

-3
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
323323
#else /* !HAVE_GETIFADDRS && !WIN32 */
324324

325325
#include <sys/ioctl.h>
326-
327-
#ifdef HAVE_NET_IF_H
328326
#include <net/if.h>
329-
#endif
330327

331328
#ifdef HAVE_SYS_SOCKIO_H
332329
#include <sys/sockio.h>

src/include/pg_config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,6 @@
325325
/* Define to 1 if you have the <netinet/tcp.h> header file. */
326326
#undef HAVE_NETINET_TCP_H
327327

328-
/* Define to 1 if you have the <net/if.h> header file. */
329-
#undef HAVE_NET_IF_H
330-
331328
/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
332329
#undef HAVE_OPENSSL_INIT_SSL
333330

src/tools/msvc/Solution.pm

-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ sub GenerateFiles
305305
HAVE_MEMSET_S => undef,
306306
HAVE_MKDTEMP => undef,
307307
HAVE_NETINET_TCP_H => undef,
308-
HAVE_NET_IF_H => undef,
309308
HAVE_OPENSSL_INIT_SSL => undef,
310309
HAVE_OSSP_UUID_H => undef,
311310
HAVE_PAM_PAM_APPL_H => undef,

0 commit comments

Comments
 (0)