romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 17:43:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: drop unused feature-detection code for Apple poll()

Browse source 
Drop Apple-specific detection logic for `poll()`. This detection snippet
has been disabled for Apple in both configure and cmake, for `poll()`
being broken on Apple since 10.12 Sierra (2016).

Also replace `exit(1);` with `return 1;` in configure, to make the
snippets match.

Added in 9297ca49f5 #1057 (2016-10-11).

Disabled for:
configure/darwin in a34c7ce754 (2016-10-18)
cmake/macOS in 825911be58 #7619
cmake/iOS in d14831233d #8244
cmake/all Apple in a86254b393 #12515

Closes #14718
This commit is contained in:
Viktor Szakats 2024-08-29 10:15:26 +02:00
parent 7c49279aaa
commit cc8b813765
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CMake/OtherTests.cmake
View file

@ -88,23 +88,6 @@ if(NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
if(0 != poll(0, 0, 10)) { if(0 != poll(0, 0, 10)) {
return 1; /* fail */ return 1; /* fail */
} }
else {
/* detect the 10.12 poll() breakage */
struct timeval before, after;
int rc;
size_t us;
gettimeofday(&before, NULL);
rc = poll(NULL, 0, 500);
gettimeofday(&after, NULL);
us = (after.tv_sec - before.tv_sec) * 1000000 +
(after.tv_usec - before.tv_usec);
if(us < 400000) {
return 1;
}
}
return 0; return 0;
}" HAVE_POLL_FINE) }" HAVE_POLL_FINE)
endif() endif()

20
m4/curl-functions.m4
View file

@ -3477,26 +3477,10 @@ AC_DEFUN([CURL_CHECK_FUNC_POLL], [
AC_LANG_PROGRAM([[ AC_LANG_PROGRAM([[
$curl_includes_stdlib $curl_includes_stdlib
$curl_includes_poll $curl_includes_poll
$curl_includes_time
]],[[ ]],[[
/* detect the original poll() breakage */ /* detect the original poll() breakage */
if(0 != poll(0, 0, 10)) if(0 != poll(0, 0, 10)) {
exit(1); /* fail */ return 1; /* fail */
else {
/* detect the 10.12 poll() breakage */
struct timeval before, after;
int rc;
size_t us;
gettimeofday(&before, NULL);
rc = poll(NULL, 0, 500);
gettimeofday(&after, NULL);
us = (after.tv_sec - before.tv_sec) * 1000000 +
(after.tv_usec - before.tv_usec);
if(us < 400000)
exit(1);
} }
]]) ]])
],[ ],[