ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'irs_buflen_socklen' into 'v9_12'

Browse Source 
Fix arch-dependent getnameinfo types

See merge request isc-projects/bind9!787
This commit is contained in:
Mark Andrews
2018-10-03 02:32:52 -04:00
parent e18bb6f569 b427dcce83
commit f0cedee039
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+5 -5
View File
@@ -19553,7 +19553,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#include <sys/socket.h>
#include <netdb.h>
int getnameinfo(const struct sockaddr *, socklen_t, char *,
socklen_t, char *, socklen_t, unsigned int);
socklen_t, char *, socklen_t, int);
int
main ()
{
@@ -19563,8 +19563,8 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: socklen_t for buflen; u_int for flags" >&5
$as_echo "socklen_t for buflen; u_int for flags" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: socklen_t for buflen; int for flags" >&5
$as_echo "socklen_t for buflen; int for flags" >&6; }
$as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
@@ -19572,7 +19572,7 @@ $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_BUFLEN_T socklen_t" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_FLAGS_T unsigned int" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19633,7 +19633,7 @@ $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_BUFLEN_T socklen_t" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
$as_echo "#define IRS_GETNAMEINFO_FLAGS_T unsigned int" >>confdefs.h
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
configure.in
+5 -5
View File
@@ -3406,14 +3406,14 @@ AC_TRY_COMPILE([
#include <sys/socket.h>
#include <netdb.h>
int getnameinfo(const struct sockaddr *, socklen_t, char *,
socklen_t, char *, socklen_t, unsigned int);],
socklen_t, char *, socklen_t, int);],
[ return (0);],
[AC_MSG_RESULT(socklen_t for buflen; u_int for flags)
[AC_MSG_RESULT(socklen_t for buflen; int for flags)
AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t,
[Define to the sockaddr length type used by getnameinfo(3).])
AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t,
[Define to the buffer length type used by getnameinfo(3).])
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, unsigned int,
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int,
[Define to the flags type used by getnameinfo(3).])],
[AC_TRY_COMPILE([
#include <sys/types.h>
@@ -3437,10 +3437,10 @@ int getnameinfo(const struct sockaddr *, size_t, char *,
AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
[AC_MSG_RESULT(not match any subspecies; assume standard definition)
[AC_MSG_RESULT(not match any subspecies; socklen_t for buflen; u_int for flags)
AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)])])])
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, unsigned int)])])])
#
# ...and same for gai_strerror().