[PATCH xserver v2] meson: Fix epoll detection

Peter Harris pharris at opentext.com
Mon Aug 14 19:54:36 UTC 2017


The epoll code depends on epoll_create1, not epoll_create.

Signed-off-by: Peter Harris <pharris at opentext.com>
---
 include/meson.build | 2 +-
 os/ospoll.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index 78ec521ac..05ef76930 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -110,7 +110,7 @@ conf_data.set('HAVE_UNISTD_H', cc.has_header('unistd.h'))
 conf_data.set('HAVE_ARC4RANDOM_BUF', cc.has_function('arc4random_buf', dependencies: libbsd_dep))
 conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace'))
 conf_data.set('HAVE_CBRT', cc.has_function('cbrt'))
-conf_data.set('HAVE_EPOLL_CREATE', cc.has_function('epoll_create'))
+conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1'))
 conf_data.set('HAVE_FFS', cc.has_function('ffs'))
 conf_data.set('HAVE_GETUID', cc.has_function('getuid'))
 conf_data.set('HAVE_GETEUID', cc.has_function('geteuid'))
diff --git a/os/ospoll.c b/os/ospoll.c
index 51bd02dc7..ca14a0c8c 100644
--- a/os/ospoll.c
+++ b/os/ospoll.c
@@ -32,7 +32,7 @@
 #include "ospoll.h"
 #include "list.h"
 
-#if !HAVE_OSPOLL && HAVE_EPOLL_CREATE1
+#if !HAVE_OSPOLL && defined(HAVE_EPOLL_CREATE1)
 #include <sys/epoll.h>
 #define EPOLL           1
 #define HAVE_OSPOLL     1
-- 
2.11.0



More information about the xorg-devel mailing list