From: Florian Weimer Date: Thu, 24 Nov 2022 11:59:22 +0100 Subject: [PATCH] configure.ac: C99 fixes for poll_works check Include if it is available for the open prototype. Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure index 8a7d47b1f9..c960b81fd7 100755 --- a/erts/configure +++ b/erts/configure @@ -24608,10 +24608,13 @@ else $as_nop /* end confdefs.h. */ #include -main() +#ifdef HAVE_FCNTL_H +#include +#endif +int main() { #ifdef _POLL_EMUL_H_ - exit(1); /* Implemented using select() -- fail */ + return 1; /* Implemented using select() -- fail */ #else struct pollfd fds[1]; int fd; @@ -24620,9 +24623,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { - exit(1); /* Does not work for devices -- fail */ + return 1; /* Does not work for devices -- fail */ } - exit(0); + return 0; #endif } diff --git a/erts/configure.ac b/erts/configure.ac index 617deafc42..23e04d09ab 100644 --- a/erts/configure.ac +++ b/erts/configure.ac @@ -3068,10 +3068,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include -main() +#ifdef HAVE_FCNTL_H +#include +#endif +int main() { #ifdef _POLL_EMUL_H_ - exit(1); /* Implemented using select() -- fail */ + return 1; /* Implemented using select() -- fail */ #else struct pollfd fds[1]; int fd; @@ -3080,9 +3083,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { - exit(1); /* Does not work for devices -- fail */ + return 1; /* Does not work for devices -- fail */ } - exit(0); + return 0; #endif } ]])],[poll_works=yes],[poll_works=no],[