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

diff --git a/acinclude.m4 b/acinclude.m4
index 13eb4936382d4a9795af22aae1e33f1958961dd9..660ce6a716a9abe012fc1118e29eac6d449be277 100644 (file)
--- 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 cb6c51afe1142a01be285019b538ca5e5854e41b..39154abfc4be1ca47b1c492cc800f00a130702f2 100644 (file)
--- 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([[