summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamal Marhubi <kamal@marhubi.com>2017-02-25 00:53:41 -0500
committerKamal Marhubi <kamal@marhubi.com>2017-02-25 05:35:40 -0500
commitac9f2910fa25e8467452f34793bdf3febe4eb04a (patch)
tree4db54b2d50e51f80086e1c2690c36a5618bd9a7e
parentc3905eeb00da163d00f470782b97cad882238f8e (diff)
downloadnix-ac9f2910fa25e8467452f34793bdf3febe4eb04a.zip
epoll: Use libc_bitflags for EpollFlags
This is possible now that EPOLLEXCLUSIVE was added to libc in https://github.com/rust-lang/libc/pull/526
-rw-r--r--src/sys/epoll.rs34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs
index 54e2eead..8632a18d 100644
--- a/src/sys/epoll.rs
+++ b/src/sys/epoll.rs
@@ -5,24 +5,24 @@ use std::ptr;
use std::mem;
use ::Error;
-bitflags!(
- #[repr(C)]
+libc_bitflags!(
pub flags EpollFlags: libc::c_int {
- const EPOLLIN = libc::EPOLLIN,
- const EPOLLPRI = libc::EPOLLPRI,
- const EPOLLOUT = libc::EPOLLOUT,
- const EPOLLRDNORM = libc::EPOLLRDNORM,
- const EPOLLRDBAND = libc::EPOLLRDBAND,
- const EPOLLWRNORM = libc::EPOLLWRNORM,
- const EPOLLWRBAND = libc::EPOLLWRBAND,
- const EPOLLMSG = libc::EPOLLMSG,
- const EPOLLERR = libc::EPOLLERR,
- const EPOLLHUP = libc::EPOLLHUP,
- const EPOLLRDHUP = libc::EPOLLRDHUP,
- const EPOLLEXCLUSIVE = 1 << 28,
- const EPOLLWAKEUP = libc::EPOLLWAKEUP,
- const EPOLLONESHOT = libc::EPOLLONESHOT,
- const EPOLLET = libc::EPOLLET,
+ EPOLLIN,
+ EPOLLPRI,
+ EPOLLOUT,
+ EPOLLRDNORM,
+ EPOLLRDBAND,
+ EPOLLWRNORM,
+ EPOLLWRBAND,
+ EPOLLMSG,
+ EPOLLERR,
+ EPOLLHUP,
+ EPOLLRDHUP,
+ #[cfg(target_os = "linux")] // Added in 4.5; not in Android.
+ EPOLLEXCLUSIVE,
+ EPOLLWAKEUP,
+ EPOLLONESHOT,
+ EPOLLET,
}
);