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

Commit ec544a6

Browse files
committed
Always use our getaddrinfo.c on Windows.
Commit a16bac3 let "configure" detect the system getaddrinfo() when building under 64-bit MinGW-w64. However, src/include/port/win32/sys/socket.h assumes all native Windows configurations use our replacement. This change placates buildfarm member jacana until we establish a plan for getaddrinfo() on Windows.
1 parent 7f7eec8 commit ec544a6

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

configure

+3-4
Original file line numberDiff line numberDiff line change
@@ -11840,10 +11840,9 @@ esac
1184011840

1184111841
# System's version of getaddrinfo(), if any, may be used only if we found
1184211842
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
11843-
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
11844-
# versions of getaddrinfo don't follow normal C call protocol. This is OK
11845-
# because we want to use our own getaddrinfo.c on Windows anyway.)
11846-
if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
11843+
# We use only our own getaddrinfo.c on Windows, but it's time to revisit that.
11844+
if test x"$ac_cv_type_struct_addrinfo" = xyes && \
11845+
test "$PORTNAME" != "win32"; then
1184711846
ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
1184811847
if test "x$ac_cv_func_getaddrinfo" = xyes; then :
1184911848
$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h

configure.in

+3-4
Original file line numberDiff line numberDiff line change
@@ -1377,10 +1377,9 @@ esac
13771377

13781378
# System's version of getaddrinfo(), if any, may be used only if we found
13791379
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
1380-
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
1381-
# versions of getaddrinfo don't follow normal C call protocol. This is OK
1382-
# because we want to use our own getaddrinfo.c on Windows anyway.)
1383-
if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
1380+
# We use only our own getaddrinfo.c on Windows, but it's time to revisit that.
1381+
if test x"$ac_cv_type_struct_addrinfo" = xyes && \
1382+
test "$PORTNAME" != "win32"; then
13841383
AC_REPLACE_FUNCS([getaddrinfo])
13851384
else
13861385
AC_LIBOBJ(getaddrinfo)

0 commit comments

Comments
 (0)