Commit ec544a65 authored by Noah Misch's avatar Noah Misch

Always use our getaddrinfo.c on Windows.

Commit a16bac36 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.
parent 7f7eec89
...@@ -11840,10 +11840,9 @@ esac ...@@ -11840,10 +11840,9 @@ esac
# System's version of getaddrinfo(), if any, may be used only if we found # System's version of getaddrinfo(), if any, may be used only if we found
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h. # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available # We use only our own getaddrinfo.c on Windows, but it's time to revisit that.
# versions of getaddrinfo don't follow normal C call protocol. This is OK if test x"$ac_cv_type_struct_addrinfo" = xyes && \
# because we want to use our own getaddrinfo.c on Windows anyway.) test "$PORTNAME" != "win32"; then
if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
if test "x$ac_cv_func_getaddrinfo" = xyes; then : if test "x$ac_cv_func_getaddrinfo" = xyes; then :
$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
......
...@@ -1377,10 +1377,9 @@ esac ...@@ -1377,10 +1377,9 @@ esac
# System's version of getaddrinfo(), if any, may be used only if we found # System's version of getaddrinfo(), if any, may be used only if we found
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h. # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available # We use only our own getaddrinfo.c on Windows, but it's time to revisit that.
# versions of getaddrinfo don't follow normal C call protocol. This is OK if test x"$ac_cv_type_struct_addrinfo" = xyes && \
# because we want to use our own getaddrinfo.c on Windows anyway.) test "$PORTNAME" != "win32"; then
if test x"$ac_cv_type_struct_addrinfo" = xyes ; then
AC_REPLACE_FUNCS([getaddrinfo]) AC_REPLACE_FUNCS([getaddrinfo])
else else
AC_LIBOBJ(getaddrinfo) AC_LIBOBJ(getaddrinfo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment