summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-12-01 10:27:24 +0100
committerMartin Sustrik <sustrik@250bpm.com>2010-12-01 10:27:24 +0100
commit17d7e6ede0f907461130302cf4bddcdf9e2737cf (patch)
tree146073f27b24bd4a861a44938c870d4b95c3b94f
parent28db150aaf7b1cffb996f1b27bc082f75acec261 (diff)
parent289b1f5ced492a2dc62edaba0016abde21093692 (diff)
Merge branch 'maint'
* maint: Remove unnecessary cast in kevent_delete Conflicts: src/kqueue.cpp Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/kqueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index b893a85..9b4dcce 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -70,7 +70,7 @@ void zmq::kqueue_t::kevent_delete (fd_t fd_, short filter_)
{
struct kevent ev;
- EV_SET (&ev, fd_, filter_, EV_DELETE, 0, 0, (kevent_udata_t) NULL);
+ EV_SET (&ev, fd_, filter_, EV_DELETE, 0, 0, 0);
int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
errno_assert (rc != -1);
}