From 184229b1e5ea26166d660eeda9a438ecd9e9be33 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 20 Jul 2008 09:46:52 +0000 Subject: [PATCH] Added "pointer to void" as another data type to check for the sixth argument of function recvfrom as a result of the info additionally logged when running on a Solaris system. The compiler error showed that the prototype being used on Solaris was the one declared in line 427 of "/usr/include/sys/socket.h" as: function(int, pointer to void, unsigned int, int, pointer to struct sockaddr, pointer to void) returning int --- acinclude.m4 | 2 +- ares/acinclude.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 13eb493..660ce6a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1644,7 +1644,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ for recvfrom_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do for recvfrom_arg4 in 'int' 'unsigned int'; do for recvfrom_arg5 in 'struct sockaddr *' 'void *'; do - for recvfrom_arg6 in 'socklen_t *' 'int *' 'unsigned int *' 'size_t *'; do + for recvfrom_arg6 in 'socklen_t *' 'int *' 'unsigned int *' 'size_t *' 'void *'; do if test "$curl_cv_func_recvfrom_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ diff --git a/ares/acinclude.m4 b/ares/acinclude.m4 index cb6c51a..39154ab 100644 --- a/ares/acinclude.m4 +++ b/ares/acinclude.m4 @@ -1111,7 +1111,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ for recvfrom_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do for recvfrom_arg4 in 'int' 'unsigned int'; do for recvfrom_arg5 in 'struct sockaddr *' 'void *'; do - for recvfrom_arg6 in 'socklen_t *' 'int *' 'unsigned int *' 'size_t *'; do + for recvfrom_arg6 in 'socklen_t *' 'int *' 'unsigned int *' 'size_t *' 'void *'; do if test "$curl_cv_func_recvfrom_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -- 2.7.4