Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 86075 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86075 | benjamin.peterson | 2010-10-31 20:44:30 -0500 (Sun, 31 Oct 2010) | 1 line

  fix output for getaddrinfo bug check #7059
........
This commit is contained in:
Benjamin Peterson 2010-11-01 01:47:19 +00:00
parent 48d1928b72
commit 75fed81c75
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 85556 .
# From configure.in Revision: 86043 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7.
#
@ -10799,6 +10799,9 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
$as_echo "$ac_cv_buggy_getaddrinfo" >&6; }
if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
then
if test $ipv6 = yes
@ -10812,6 +10815,7 @@ else
$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
fi
for ac_func in getnameinfo
do :
ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"

3
configure.in
View File

@ -3109,6 +3109,8 @@ int main()
[ac_cv_buggy_getaddrinfo=yes]))
fi
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
then
if test $ipv6 = yes
@ -3120,6 +3122,7 @@ then
else
AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if you have the getaddrinfo function.])
fi
AC_CHECK_FUNCS(getnameinfo)
# checks for structures