diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-12-09 03:52:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 03:52:20 -0300 |
| commit | e94dd7e2c4fc3f7ca2c15c01bdc301be2b8a4c1b (patch) | |
| tree | 4ecd8c67c12e99dd8935487f4044f311b1b8311b /src/core/hle/service/sockets/sockets.h | |
| parent | ce5fcb6bb2c358b0251a2ce87945bda52789a76d (diff) | |
| parent | 0791082b435371837bbecd50575911ce0ba16dc9 (diff) | |
Merge pull request #5142 from comex/xx-poll-events
network, sockets: Replace `POLL_IN`, `POLL_OUT`, etc. constants with an `enum class PollEvents`
Diffstat (limited to 'src/core/hle/service/sockets/sockets.h')
| -rw-r--r-- | src/core/hle/service/sockets/sockets.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/core/hle/service/sockets/sockets.h b/src/core/hle/service/sockets/sockets.h index 89a410076..5a65ed2a9 100644 --- a/src/core/hle/service/sockets/sockets.h +++ b/src/core/hle/service/sockets/sockets.h @@ -69,10 +69,22 @@ struct SockAddrIn { std::array<u8, 8> zeroes; }; +enum class PollEvents : u16 { + // Using Pascal case because IN is a macro on Windows. + In = 1 << 0, + Pri = 1 << 1, + Out = 1 << 2, + Err = 1 << 3, + Hup = 1 << 4, + Nval = 1 << 5, +}; + +DECLARE_ENUM_FLAG_OPERATORS(PollEvents); + struct PollFD { s32 fd; - u16 events; - u16 revents; + PollEvents events; + PollEvents revents; }; struct Linger { @@ -80,13 +92,6 @@ struct Linger { u32 linger; }; -constexpr u16 POLL_IN = 0x01; -constexpr u16 POLL_PRI = 0x02; -constexpr u16 POLL_OUT = 0x04; -constexpr u16 POLL_ERR = 0x08; -constexpr u16 POLL_HUP = 0x10; -constexpr u16 POLL_NVAL = 0x20; - constexpr u32 FLAG_MSG_DONTWAIT = 0x80; constexpr u32 FLAG_O_NONBLOCK = 0x800; |