luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-31 06:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'epoll-create' into 'main'

Browse Source 
giounix-private: Fix macro for checking for epoll_create1()

See merge request GNOME/glib!4563
This commit is contained in:
Michael Catanzaro
2025-03-20 12:33:50 +00:00
parent 88e8ee515c 20f083ea7c
commit 08489deb06
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/giounix-private.c
View File

@@ -23,7 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#if defined (HAVE_EPOLL_CREATE) #if defined (HAVE_EPOLL_CREATE1)
#include <sys/epoll.h> #include <sys/epoll.h>
#elif defined (HAVE_KQUEUE) #elif defined (HAVE_KQUEUE)
#include <sys/event.h> #include <sys/event.h>
@@ -65,7 +65,7 @@ _g_fd_is_pollable (int fd)
* absolute certainty: * absolute certainty:
*/ */
#if defined (HAVE_EPOLL_CREATE) #if defined (HAVE_EPOLL_CREATE1)
/* /*
* Linux * Linux
* *

2
gio/tests/pollable.c
View File

@@ -267,7 +267,7 @@ test_pollable_unix_nulldev (void)
"on a system where we are able to tell it apart from devices " "on a system where we are able to tell it apart from devices "
"that actually implement poll"); "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); int fd = g_open ("/dev/null", O_RDWR, 0);
g_assert_cmpint (fd, !=, -1); g_assert_cmpint (fd, !=, -1);