diff options
| -rw-r--r-- | src/sys/event.rs | 75 | ||||
| -rw-r--r-- | src/sys/memfd.rs | 6 | ||||
| -rw-r--r-- | src/sys/mod.rs | 20 |
3 files changed, 49 insertions, 52 deletions
diff --git a/src/sys/event.rs b/src/sys/event.rs index 1f9c1251..a96dd07c 100644 --- a/src/sys/event.rs +++ b/src/sys/event.rs @@ -30,51 +30,40 @@ type type_of_udata = intptr_t; #[cfg(any(target_os = "netbsd", target_os = "openbsd"))] type type_of_data = libc::int64_t; +#[cfg(target_os = "netbsd")] +type type_of_event_filter = u32; #[cfg(not(target_os = "netbsd"))] type type_of_event_filter = i16; -#[cfg(not(target_os = "netbsd"))] -#[repr(i16)] -#[derive(Clone, Copy, Debug, PartialEq)] -pub enum EventFilter { - EVFILT_AIO = libc::EVFILT_AIO, - #[cfg(target_os = "dragonfly")] - EVFILT_EXCEPT = libc::EVFILT_EXCEPT, - #[cfg(any(target_os = "macos", target_os = "ios", - target_os = "dragonfly", - target_os = "freebsd"))] - EVFILT_FS = libc::EVFILT_FS, - #[cfg(target_os = "freebsd")] - EVFILT_LIO = libc::EVFILT_LIO, - #[cfg(any(target_os = "macos", target_os = "ios"))] - EVFILT_MACHPORT = libc::EVFILT_MACHPORT, - EVFILT_PROC = libc::EVFILT_PROC, - EVFILT_READ = libc::EVFILT_READ, - EVFILT_SIGNAL = libc::EVFILT_SIGNAL, - EVFILT_TIMER = libc::EVFILT_TIMER, - #[cfg(any(target_os = "macos", - target_os = "ios", - target_os = "dragonfly", - target_os = "freebsd"))] - EVFILT_USER = libc::EVFILT_USER, - #[cfg(any(target_os = "macos", target_os = "ios"))] - EVFILT_VM = libc::EVFILT_VM, - EVFILT_VNODE = libc::EVFILT_VNODE, - EVFILT_WRITE = libc::EVFILT_WRITE, -} - -#[cfg(target_os = "netbsd")] -type type_of_event_filter = libc::uint32_t; -#[cfg(target_os = "netbsd")] -#[repr(i32)] -#[derive(Clone, Copy, Debug, PartialEq)] -pub enum EventFilter { - EVFILT_READ = libc::EVFILT_READ, - EVFILT_WRITE = libc::EVFILT_WRITE, - EVFILT_AIO = libc::EVFILT_AIO, - EVFILT_VNODE = libc::EVFILT_VNODE, - EVFILT_PROC = libc::EVFILT_PROC, - EVFILT_SIGNAL = libc::EVFILT_SIGNAL, - EVFILT_TIMER = libc::EVFILT_TIMER, +libc_enum!{ + #[cfg_attr(target_os = "netbsd", repr(u32))] + #[cfg_attr(not(target_os = "netbsd"), repr(i16))] + pub enum EventFilter { + EVFILT_AIO, + #[cfg(target_os = "dragonfly")] + EVFILT_EXCEPT, + #[cfg(any(target_os = "dragonfly", + target_os = "freebsd", + target_os = "ios", + target_os = "macos"))] + EVFILT_FS, + #[cfg(target_os = "freebsd")] + EVFILT_LIO, + #[cfg(any(target_os = "ios", target_os = "macos"))] + EVFILT_MACHPORT, + EVFILT_PROC, + EVFILT_READ, + EVFILT_SIGNAL, + EVFILT_TIMER, + #[cfg(any(target_os = "dragonfly", + target_os = "freebsd", + target_os = "ios", + target_os = "macos"))] + EVFILT_USER, + #[cfg(any(target_os = "ios", target_os = "macos"))] + EVFILT_VM, + EVFILT_VNODE, + EVFILT_WRITE, + } } #[cfg(any(target_os = "dragonfly", target_os = "freebsd", diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs index 056e9e43..88c1dac9 100644 --- a/src/sys/memfd.rs +++ b/src/sys/memfd.rs @@ -3,10 +3,10 @@ use std::os::unix::io::RawFd; use {Errno, Result}; use std::ffi::CStr; -bitflags!( +libc_bitflags!( pub struct MemFdCreateFlag: libc::c_uint { - const MFD_CLOEXEC = 0x0001; - const MFD_ALLOW_SEALING = 0x0002; + MFD_CLOEXEC; + MFD_ALLOW_SEALING; } ); diff --git a/src/sys/mod.rs b/src/sys/mod.rs index c99fe2db..a94b8a06 100644 --- a/src/sys/mod.rs +++ b/src/sys/mod.rs @@ -1,12 +1,20 @@ -#[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_os = "ios", - target_os = "netbsd", target_os = "macos", target_os = "linux"))] +#[cfg(any(target_os = "dragonfly", + target_os = "freebsd", + target_os = "ios", + target_os = "linux", + target_os = "macos", + target_os = "netbsd"))] pub mod aio; -#[cfg(any(target_os = "linux", target_os = "android"))] +#[cfg(any(target_os = "android", target_os = "linux"))] pub mod epoll; -#[cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd", - target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd"))] +#[cfg(any(target_os = "dragonfly", + target_os = "freebsd", + target_os = "ios", + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd"))] pub mod event; #[cfg(target_os = "linux")] @@ -46,7 +54,7 @@ pub mod uio; pub mod time; -#[cfg(any(target_os = "linux", target_os = "android"))] +#[cfg(any(target_os = "android", target_os = "linux"))] pub mod ptrace; pub mod select; |