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

Commit 2cea02f

Browse files
committed
Remove configure probe for sys/sockio.h.
On BSD-family systems, header <sys/sockio.h> defines socket ioctl numbers like SIOCGIFCONF. Only AIX is using those now, but it defines them in <net/if.h> anyway. Supposing some PostgreSQL hacker wants to test that AIX-only code path on a more common development system by pretending not to have getifaddrs(). It's enough to include <sys/ioctl.h>, at least on macOS, FreeBSD and Linux, and we're already doing that.
1 parent 2f8d918 commit 2cea02f

File tree

5 files changed

+1
-10
lines changed

5 files changed

+1
-10
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 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/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
@@ -1457,7 +1457,6 @@ AC_CHECK_HEADERS(m4_normalize([
14571457
sys/prctl.h
14581458
sys/procctl.h
14591459
sys/signalfd.h
1460-
sys/sockio.h
14611460
sys/ucred.h
14621461
termios.h
14631462
ucred.h

src/backend/libpq/ifaddr.c

-4
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,6 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
325325
#include <sys/ioctl.h>
326326
#include <net/if.h>
327327

328-
#ifdef HAVE_SYS_SOCKIO_H
329-
#include <sys/sockio.h>
330-
#endif
331-
332328
#if defined(SIOCGIFCONF)
333329

334330
/*

src/include/pg_config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,6 @@
490490
/* Define to 1 if you have the <sys/signalfd.h> header file. */
491491
#undef HAVE_SYS_SIGNALFD_H
492492

493-
/* Define to 1 if you have the <sys/sockio.h> header file. */
494-
#undef HAVE_SYS_SOCKIO_H
495-
496493
/* Define to 1 if you have the <sys/stat.h> header file. */
497494
#undef HAVE_SYS_STAT_H
498495

src/tools/msvc/Solution.pm

-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ sub GenerateFiles
359359
HAVE_SYS_PRCTL_H => undef,
360360
HAVE_SYS_PROCCTL_H => undef,
361361
HAVE_SYS_SIGNALFD_H => undef,
362-
HAVE_SYS_SOCKIO_H => undef,
363362
HAVE_SYS_STAT_H => 1,
364363
HAVE_SYS_TYPES_H => 1,
365364
HAVE_SYS_UCRED_H => undef,

0 commit comments

Comments
 (0)