diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-15 19:18:48 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-15 19:18:48 +0200 |
| commit | 7a2d16241416fe8ae88541e1087aa502c6a5388c (patch) | |
| tree | c5119138eac92cb2817f6ce657aada1bde2024ed /source4/lib/events | |
| parent | 7cb41fde3c586daff0c9f52b2b214a8afc3a82a3 (diff) | |
| parent | 5aec74c676c6cfd60ebf590a1b0a6d1000b8e33a (diff) | |
| download | samba-7a2d16241416fe8ae88541e1087aa502c6a5388c.tar.gz samba-7a2d16241416fe8ae88541e1087aa502c6a5388c.tar.bz2 samba-7a2d16241416fe8ae88541e1087aa502c6a5388c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 1659a572c49b2f9cf336b27ec1c1bec1b86d688e)
Diffstat (limited to 'source4/lib/events')
| -rw-r--r-- | source4/lib/events/events_aio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/events/events_aio.c b/source4/lib/events/events_aio.c index 9d13ea96fd..933ce26bf6 100644 --- a/source4/lib/events/events_aio.c +++ b/source4/lib/events/events_aio.c @@ -31,7 +31,7 @@ */ #include "system/filesys.h" -#include "system/network.h" +#include "replace.h" #include "events.h" #include "events_internal.h" #include <sys/epoll.h> @@ -138,7 +138,7 @@ static void epoll_add_event(struct aio_event_context *aio_ev, struct fd_event *f /* if we don't want events yet, don't add an aio_event */ if (fde->flags == 0) return; - ZERO_STRUCT(event); + memset(&event, 0, sizeof(event)); event.events = epoll_map_flags(fde->flags); event.data.ptr = fde; epoll_ctl(aio_ev->epoll_fd, EPOLL_CTL_ADD, fde->fd, &event); @@ -479,7 +479,7 @@ static int aio_event_loop_once(struct event_context *ev) struct timeval tval; tval = common_event_loop_timer_delay(ev); - if (timeval_is_zero(&tval)) { + if (ev_timeval_is_zero(&tval)) { return 0; } |