From 1cc1fb1c72307c224dbad4d54e91a2e98858a5d4 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 30 Oct 2019 13:44:07 +0100 Subject: [PATCH] app/internal/window: replace ppoll with poll We're about to add FreeBSD where ppoll is not supported. Signed-off-by: Elias Naur --- app/internal/window/os_wayland.go | 4 ++-- app/internal/window/os_x11.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/internal/window/os_wayland.go b/app/internal/window/os_wayland.go index 252c7ee9..318f2477 100644 --- a/app/internal/window/os_wayland.go +++ b/app/internal/window/os_wayland.go @@ -783,8 +783,8 @@ loop: } // Clear poll events. dispFd.Revents = 0 - if _, err := syscall.Ppoll(pollfds, nil, nil); err != nil && err != syscall.EINTR { - panic(fmt.Errorf("ppoll failed: %v", err)) + if _, err := syscall.Poll(pollfds, -1); err != nil && err != syscall.EINTR { + panic(fmt.Errorf("poll failed: %v", err)) } redraw := false // Clear notifications. diff --git a/app/internal/window/os_x11.go b/app/internal/window/os_x11.go index 9cbe2300..1174a786 100644 --- a/app/internal/window/os_x11.go +++ b/app/internal/window/os_x11.go @@ -141,7 +141,7 @@ loop: var syn, redraw bool // Check for pending draw events before checking animation or blocking. // This fixes an issue on Xephyr where on startup XPending() > 0 but - // Ppoll will still block. This also prevents no-op calls to Ppoll. + // poll will still block. This also prevents no-op calls to poll. if syn = h.handleEvents(); !syn { w.mu.Lock() animating := w.animating @@ -152,7 +152,7 @@ loop: // Clear poll events. *xEvents = 0 // Wait for X event or gio notification. - if _, err := syscall.Ppoll(pollfds, nil, nil); err != nil && err != syscall.EINTR { + if _, err := syscall.Poll(pollfds, -1); err != nil && err != syscall.EINTR { panic(fmt.Errorf("x11 loop: poll failed: %w", err)) } switch {