Merge branch 'darwin-basedon-Torrekie' into 'main'

Add Darwin support - updated

Closes #545 and #310

See merge request wayland/wayland!481
This commit is contained in:
Liang Qi 2026-06-11 08:35:32 +00:00
commit dfd266bbfd
15 changed files with 238 additions and 20 deletions

View file

@ -38,7 +38,6 @@
#include <sys/un.h>
#include <ctype.h>
#include <fcntl.h>
#include <poll.h>
#include <pthread.h>
#include "wayland-util.h"
@ -2055,7 +2054,7 @@ wl_display_poll(struct wl_display *display,
timespec_sub_saturate(&result, &deadline, &now);
remaining_timeout = &result;
}
ret = ppoll(pfd, 1, remaining_timeout, NULL);
ret = wl_os_ppoll(pfd, 1, remaining_timeout, NULL);
} while (ret == -1 && errno == EINTR);
return ret;