aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-11-14 14:47:53 +0000
committerYang Tse <yangsita@gmail.com>2008-11-14 14:47:53 +0000
commit2cd44abafceb9e1e14fc8d4509594dd12d2e4986 (patch)
tree4763cc66d194cf38c2881d8cc09287652c756c53
parent4b486ebbc1f578af786333cde4e22e3d56c41622 (diff)
#include <string.h> in the getaddrinfo() runtime check for the memset() prototype
-rw-r--r--ares/m4/cares-functions.m44
-rw-r--r--m4/curl-functions.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/ares/m4/cares-functions.m4 b/ares/m4/cares-functions.m4
index 1e9bde9a5..aff65b845 100644
--- a/ares/m4/cares-functions.m4
+++ b/ares/m4/cares-functions.m4
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 20
+# serial 21
dnl CARES_INCLUDES_ARPA_INET
@@ -540,6 +540,7 @@ dnl HAVE_GETADDRINFO will be defined.
AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
AC_REQUIRE([CARES_INCLUDES_WS2TCPIP])dnl
AC_REQUIRE([CARES_INCLUDES_STDLIB])dnl
+ AC_REQUIRE([CARES_INCLUDES_STRING])dnl
AC_REQUIRE([CARES_INCLUDES_SYS_SOCKET])dnl
AC_REQUIRE([CARES_INCLUDES_NETDB])dnl
#
@@ -610,6 +611,7 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
AC_LANG_PROGRAM([[
$cares_includes_ws2tcpip
$cares_includes_stdlib
+ $cares_includes_string
$cares_includes_sys_socket
$cares_includes_netdb
]],[[
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 90c7f9194..b25f9b686 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -22,7 +22,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 37
+# serial 38
dnl CURL_INCLUDES_ARPA_INET
@@ -1004,6 +1004,7 @@ dnl HAVE_GETADDRINFO will be defined.
AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl
AC_REQUIRE([CURL_INCLUDES_STDLIB])dnl
+ AC_REQUIRE([CURL_INCLUDES_STRING])dnl
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl
AC_REQUIRE([CURL_INCLUDES_NETDB])dnl
#
@@ -1074,6 +1075,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
AC_LANG_PROGRAM([[
$curl_includes_ws2tcpip
$curl_includes_stdlib
+ $curl_includes_string
$curl_includes_sys_socket
$curl_includes_netdb
]],[[