Merge branch 'maint'

* maint:
  Remove unnecessary cast in kevent_delete

Conflicts:
	src/kqueue.cpp

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2010-12-01 10:27:24 +01:00
commit 17d7e6ede0

View File

@ -70,7 +70,7 @@ void zmq::kqueue_t::kevent_delete (fd_t fd_, short filter_)
{ {
struct kevent ev; 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); int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
errno_assert (rc != -1); errno_assert (rc != -1);
} }