diff options
| author | hhb <haibohuang2010@gmail.com> | 2019-01-18 15:03:49 -0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-01-19 20:24:00 +0100 |
| commit | 21c379421169b1e2bed61214e090c454577a5790 (patch) | |
| tree | dff5d84cc222ac2f4bcbbe6b042d30d6f2ad5b1f /acinclude.m4 | |
| parent | 09662337441c40c23da7b557c4cceacd7cc3b76e (diff) | |
| download | curl-21c379421169b1e2bed61214e090c454577a5790.tar.gz | |
configure: fix recv/send/select detection on Android
This reverts commit d4f25201fb7da03fc88f90d51101beb3d0026db9.
The overloadable attribute is removed again starting from
NDK17. Actually they only exist in two NDK versions (15 and 16). With
overloadable, the first condition tried will succeed. Results in wrong
detection result.
Closes #3484
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c4c75f3b5..982d38e56 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1083,9 +1083,6 @@ 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; @@ -1220,9 +1217,6 @@ 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; @@ -1931,10 +1925,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ }; #endif extern $sel_retv SELECTCALLCONV -#ifdef __ANDROID__ -__attribute__((overloadable)) -#endif - select($sel_arg1, + select($sel_arg1, $sel_arg234, $sel_arg234, $sel_arg234, |