Unverified Commit 58845f2e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: fix recv/send/select detection on Android 

... since they now provide several functions as
__attribute__((overloadable)), the argument detection logic need
updates.

Patched-by: destman at github

Fixes #1738
Closes #1739
parent 18eac3df

acinclude.m4

+20 −6
Original line number Diff line number Diff line
@@ -1082,7 +1082,11 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ 
#endif

#define GNICALLCONV

#endif

                    extern int GNICALLCONV getnameinfo($gni_arg1, $gni_arg2,

                    extern int GNICALLCONV

#ifdef __ANDROID__

__attribute__((overloadable))

#endif

				getnameinfo($gni_arg1, $gni_arg2,

                                           char *, $gni_arg46,

                                           char *, $gni_arg46,

                                           $gni_arg7);
@@ -1386,6 +1390,9 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ 
#define RECVCALLCONV

#endif

                      extern $recv_retv RECVCALLCONV

#ifdef __ANDROID__

__attribute__((overloadable))

#endif

                      recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);

                    ]],[[

                      $recv_arg1 s=0;
@@ -1520,6 +1527,9 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ 
#define SENDCALLCONV

#endif

                      extern $send_retv SENDCALLCONV

#ifdef __ANDROID__

__attribute__((overloadable))

#endif

                      send($send_arg1, $send_arg2, $send_arg3, $send_arg4);

                    ]],[[

                      $send_arg1 s=0;
@@ -2365,7 +2375,11 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ 
                      long tv_usec;

                    };

#endif

                    extern $sel_retv SELECTCALLCONV select($sel_arg1,

                    extern $sel_retv SELECTCALLCONV

#ifdef __ANDROID__

__attribute__((overloadable))

#endif

			select($sel_arg1,

					$sel_arg234,

					$sel_arg234,

					$sel_arg234,