Commit 184229b1 authored by Yang Tse's avatar Yang Tse
Browse files

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
parent 3e488c4f

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -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([[

ares/acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -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([[