]> granicus.if.org Git - curl/commitdiff
configure: fix recv/send/select detection on Android
authorhhb <haibohuang2010@gmail.com>
Fri, 18 Jan 2019 23:03:49 +0000 (15:03 -0800)
committerDaniel Stenberg <daniel@haxx.se>
Sat, 19 Jan 2019 19:24:00 +0000 (20:24 +0100)
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

acinclude.m4

index c4c75f3b50e542eb59487dbd8c71a780d18ea202..982d38e5617072f6b646d417d43be63be1e7ce44 100644 (file)
@@ -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,