From ec544a65c9090bc9da11ea384d1369fd552ca8b0 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Thu, 28 Aug 2014 20:36:27 -0400 Subject: [PATCH] Always use our getaddrinfo.c on Windows. Commit a16bac36eca8158cbf78987e95376f610095f792 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. --- configure | 7 +++---- configure.in | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 25dc9befe6b..bc4cf655d53 100755 --- a/configure +++ b/configure @@ -11840,10 +11840,9 @@ esac # 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. -# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available -# versions of getaddrinfo don't follow normal C call protocol. This is OK -# because we want to use our own getaddrinfo.c on Windows anyway.) -if test x"$ac_cv_type_struct_addrinfo" = xyes ; then +# We use only our own getaddrinfo.c on Windows, but it's time to revisit that. +if test x"$ac_cv_type_struct_addrinfo" = xyes && \ + test "$PORTNAME" != "win32"; then ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" if test "x$ac_cv_func_getaddrinfo" = xyes; then : $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h diff --git a/configure.in b/configure.in index 6393fffcf3b..c22d3ddb1af 100644 --- a/configure.in +++ b/configure.in @@ -1377,10 +1377,9 @@ esac # 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. -# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available -# versions of getaddrinfo don't follow normal C call protocol. This is OK -# because we want to use our own getaddrinfo.c on Windows anyway.) -if test x"$ac_cv_type_struct_addrinfo" = xyes ; then +# We use only our own getaddrinfo.c on Windows, but it's time to revisit that. +if test x"$ac_cv_type_struct_addrinfo" = xyes && \ + test "$PORTNAME" != "win32"; then AC_REPLACE_FUNCS([getaddrinfo]) else AC_LIBOBJ(getaddrinfo)