From: Simo Sorce <idra@samba.org>
Date: Sat, 14 Jun 2008 19:54:46 +0000 (-0400)
Subject: Fix events_aio
X-Git-Tag: samba-4.0.0alpha5~52^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5525b79649ff75d6e9e853615949e4fbe9e0b6e;p=thirdparty%2Fsamba.git

Fix events_aio
---

diff --git a/source/lib/events/events_aio.c b/source/lib/events/events_aio.c
index 9d13ea96fdd..933ce26bf6b 100644
--- a/source/lib/events/events_aio.c
+++ b/source/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;
 	}