diff options
| author | Robin Burchell <viroteck@viroteck.net> | 2012-05-23 03:17:37 -0700 |
|---|---|---|
| committer | Robin Burchell <viroteck@viroteck.net> | 2012-05-23 03:17:37 -0700 |
| commit | d2804129b78442eab145f64bc8b1627b03d91e67 (patch) | |
| tree | fb030e0399be14e3692cb5534a63ea199767df88 | |
| parent | 2916ae7c920c069ff180f0224b2dc953bbd32501 (diff) | |
| parent | 5245a9d7c49b2b397f38b915382adae3483b6e17 (diff) | |
Merge pull request #136 from nenolod/bugfix/epoll-nitpicks-2.0
[2.0] epoll: make sure EPOLLET flag does not get clobbered
| -rw-r--r-- | src/socketengines/socketengine_epoll.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 567ddd69f..79d69698a 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -90,9 +90,9 @@ EPollEngine::~EPollEngine() delete[] events; } -static int mask_to_epoll(int event_mask) +static unsigned mask_to_epoll(int event_mask) { - int rv = 0; + unsigned rv = 0; if (event_mask & (FD_WANT_POLL_READ | FD_WANT_POLL_WRITE | FD_WANT_SINGLE_WRITE)) { // we need to use standard polling on this FD @@ -149,8 +149,8 @@ bool EPollEngine::AddFd(EventHandler* eh, int event_mask) void EPollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - int old_events = mask_to_epoll(old_mask); - int new_events = mask_to_epoll(new_mask); + unsigned old_events = mask_to_epoll(old_mask); + unsigned new_events = mask_to_epoll(new_mask); if (old_events != new_events) { // ok, we actually have something to tell the kernel about |