Skip to content

Commit 7289069

Browse files
committed
Consolidate common EPOLL flags
EPOLLRDHUP, EPOLLRDUP, and EPOLLONESHOT have the same definition on all linux-like platforms.
1 parent e4ecf4b commit 7289069

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

src/unix/linux_like/android/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -792,9 +792,6 @@ pub const EPROTO: ::c_int = 71;
792792
pub const EDOTDOT: ::c_int = 73;
793793

794794
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
795-
pub const EPOLLONESHOT: ::c_int = 0x40000000;
796-
pub const EPOLLRDHUP: ::c_int = 0x00002000;
797-
pub const EPOLLWAKEUP: ::c_int = 0x20000000;
798795

799796
// sys/eventfd.h
800797
pub const EFD_SEMAPHORE: ::c_int = 0x1;

src/unix/linux_like/emscripten/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -965,9 +965,7 @@ pub const SHM_UNLOCK: ::c_int = 12;
965965
pub const SHM_HUGETLB: ::c_int = 0o4000;
966966
pub const SHM_NORESERVE: ::c_int = 0o10000;
967967

968-
pub const EPOLLRDHUP: ::c_int = 0x2000;
969968
pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000;
970-
pub const EPOLLONESHOT: ::c_int = 0x40000000;
971969

972970
pub const QFMT_VFS_OLD: ::c_int = 1;
973971
pub const QFMT_VFS_V0: ::c_int = 2;
@@ -1372,8 +1370,6 @@ pub const PTRACE_INTERRUPT: ::c_int = 0x4207;
13721370
pub const PTRACE_LISTEN: ::c_int = 0x4208;
13731371
pub const PTRACE_PEEKSIGINFO: ::c_int = 0x4209;
13741372

1375-
pub const EPOLLWAKEUP: ::c_int = 0x20000000;
1376-
13771373
pub const PTRACE_GETFPREGS: ::c_uint = 14;
13781374
pub const PTRACE_SETFPREGS: ::c_uint = 15;
13791375
pub const PTRACE_GETFPXREGS: ::c_uint = 18;

src/unix/linux_like/linux/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,10 +1551,7 @@ pub const SHM_HUGETLB: ::c_int = 0o4000;
15511551
#[cfg(not(all(target_env = "uclibc", target_arch = "mips")))]
15521552
pub const SHM_NORESERVE: ::c_int = 0o10000;
15531553

1554-
pub const EPOLLRDHUP: ::c_int = 0x2000;
15551554
pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000;
1556-
pub const EPOLLWAKEUP: ::c_int = 0x20000000;
1557-
pub const EPOLLONESHOT: ::c_int = 0x40000000;
15581555

15591556
pub const QFMT_VFS_OLD: ::c_int = 1;
15601557
pub const QFMT_VFS_V0: ::c_int = 2;

src/unix/linux_like/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,9 @@ pub const EPOLLRDBAND: ::c_int = 0x80;
10351035
pub const EPOLLWRNORM: ::c_int = 0x100;
10361036
pub const EPOLLWRBAND: ::c_int = 0x200;
10371037
pub const EPOLLMSG: ::c_int = 0x400;
1038+
pub const EPOLLRDHUP: ::c_int = 0x2000;
1039+
pub const EPOLLWAKEUP: ::c_int = 0x20000000;
1040+
pub const EPOLLONESHOT: ::c_int = 0x40000000;
10381041
pub const EPOLLET: ::c_int = 0x80000000;
10391042

10401043
pub const EPOLL_CTL_ADD: ::c_int = 1;

0 commit comments

Comments
 (0)