From 20f083ea7cd0daa93030ac7bd414b831cdd663e7 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 20 Mar 2025 11:12:58 +0000 Subject: [PATCH] giounix-private: Fix macro for checking for epoll_create1() Like many things I touch, I broke this in fd8ede0b661aa67032bbc3e7afc88aff22d7984a. Spotted by Sebastian Wilhelmi in https://gitlab.gnome.org/GNOME/glib/-/commit/fd8ede0b661aa67032bbc3e7afc88aff22d7984a#note_2385263. Signed-off-by: Philip Withnall --- gio/giounix-private.c | 4 ++-- gio/tests/pollable.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/giounix-private.c b/gio/giounix-private.c index 0e66af888..b085b2535 100644 --- a/gio/giounix-private.c +++ b/gio/giounix-private.c @@ -23,7 +23,7 @@ #include #include #include -#if defined (HAVE_EPOLL_CREATE) +#if defined (HAVE_EPOLL_CREATE1) #include #elif defined (HAVE_KQUEUE) #include @@ -65,7 +65,7 @@ _g_fd_is_pollable (int fd) * absolute certainty: */ -#if defined (HAVE_EPOLL_CREATE) +#if defined (HAVE_EPOLL_CREATE1) /* * Linux * diff --git a/gio/tests/pollable.c b/gio/tests/pollable.c index 540f200c6..87449c353 100644 --- a/gio/tests/pollable.c +++ b/gio/tests/pollable.c @@ -267,7 +267,7 @@ test_pollable_unix_nulldev (void) "on a system where we are able to tell it apart from devices " "that actually implement poll"); -#if defined (HAVE_EPOLL_CREATE) || defined (HAVE_KQUEUE) +#if defined (HAVE_EPOLL_CREATE1) || defined (HAVE_KQUEUE) int fd = g_open ("/dev/null", O_RDWR, 0); g_assert_cmpint (fd, !=, -1);