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
erlang · Jan 10, 2025 · a2c9c99 · a2c9c99
2 parents aa2b747 + 189d312
commit a2c9c99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/erts/configure b/erts/configure
@@ -21677,6 +21677,7 @@ else case e in #(
 /* end confdefs.h.  */
 
 #include <stdlib.h>
+#include <unistd.h>
 #ifdef HAVE_MALLOC_H
 #  include <malloc.h>
 #endif
@@ -25866,8 +25867,10 @@ else case e in #(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <fcntl.h>
 #include <poll.h>
-main()
+#include <stdlib.h>
+int main()
 {
 #ifdef _POLL_EMUL_H_
   exit(1); /* Implemented using select() -- fail */

diff --git a/erts/configure.ac b/erts/configure.ac
@@ -2439,6 +2439,7 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use],
 		erts_cv___after_morecore_hook_can_track_malloc,
 		[AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
+#include <unistd.h>
 #ifdef HAVE_MALLOC_H
 #  include <malloc.h>
 #endif
@@ -3133,8 +3134,10 @@ poll_works=no
 [
 
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <fcntl.h>
 #include <poll.h>
-main()
+#include <stdlib.h>
+int main()
 {
 #ifdef _POLL_EMUL_H_
   exit(1); /* Implemented using select() -- fail */