[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-76-gd5525b7

[Simo Sorce]

The branch, v4-0-test has been updated
       via  d5525b79649ff75d6e9e853615949e4fbe9e0b6e (commit)
      from  9a169c341bfb0c4ff423f05c27345d439890576c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit d5525b79649ff75d6e9e853615949e4fbe9e0b6e
Author: Simo Sorce <idra at samba.org>
Date:   Sat Jun 14 15:54:46 2008 -0400

    Fix events_aio

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events/events_aio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository