Skip to content

Commit b9a0a6a

Browse files
committed
Auto merge of #537 - Susurrus:master, r=alexcrichton
Add ppoll() for all unix platforms I'm unsure of whether there is support in OS X for this, and I can't find anything online (so I'm betting there isn't), but I'm going to let this run through CI to confirm.
2 parents dc1aa0e + 88e37f2 commit b9a0a6a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,10 @@ extern {
950950
pub fn pthread_mutex_timedlock(lock: *mut pthread_mutex_t,
951951
abstime: *const ::timespec) -> ::c_int;
952952
pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
953+
pub fn ppoll(fds: *mut ::pollfd,
954+
nfds: ::nfds_t,
955+
timeout: *const ::timespec,
956+
sigmask: *const sigset_t) -> ::c_int;
953957
}
954958

955959
cfg_if! {

src/unix/notbsd/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,10 @@ extern {
841841
linkpath: *const ::c_char) -> ::c_int;
842842
pub fn unlinkat(dirfd: ::c_int, pathname: *const ::c_char,
843843
flags: ::c_int) -> ::c_int;
844+
pub fn ppoll(fds: *mut ::pollfd,
845+
nfds: nfds_t,
846+
timeout: *const ::timespec,
847+
sigmask: *const sigset_t) -> ::c_int;
844848
pub fn pthread_condattr_getclock(attr: *const pthread_condattr_t,
845849
clock_id: *mut clockid_t) -> ::c_int;
846850
pub fn pthread_condattr_setclock(attr: *mut pthread_condattr_t,

0 commit comments

Comments
 (0)