Skip to content

Commit a2c9c99

Browse files
committed
Merge branch 'john/merge-9211/OTP-19407/GH-9211/PR-9234' into maint
* john/merge-9211/OTP-19407/GH-9211/PR-9234: Make `poll()` test work with `gcc` 14
2 parents aa2b747 + 189d312 commit a2c9c99

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

erts/configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21677,6 +21677,7 @@ else case e in #(
2167721677
/* end confdefs.h. */
2167821678

2167921679
#include <stdlib.h>
21680+
#include <unistd.h>
2168021681
#ifdef HAVE_MALLOC_H
2168121682
# include <malloc.h>
2168221683
#endif
@@ -25866,8 +25867,10 @@ else case e in #(
2586625867
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2586725868
/* end confdefs.h. */
2586825869

25870+
#include <fcntl.h>
2586925871
#include <poll.h>
25870-
main()
25872+
#include <stdlib.h>
25873+
int main()
2587125874
{
2587225875
#ifdef _POLL_EMUL_H_
2587325876
exit(1); /* Implemented using select() -- fail */

erts/configure.ac

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2439,6 +2439,7 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use],
24392439
erts_cv___after_morecore_hook_can_track_malloc,
24402440
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
24412441
#include <stdlib.h>
2442+
#include <unistd.h>
24422443
#ifdef HAVE_MALLOC_H
24432444
# include <malloc.h>
24442445
#endif
@@ -3133,8 +3134,10 @@ poll_works=no
31333134
[
31343135
31353136
AC_RUN_IFELSE([AC_LANG_SOURCE([[
3137+
#include <fcntl.h>
31363138
#include <poll.h>
3137-
main()
3139+
#include <stdlib.h>
3140+
int main()
31383141
{
31393142
#ifdef _POLL_EMUL_H_
31403143
exit(1); /* Implemented using select() -- fail */

0 commit comments

Comments
 (0)