--- libaitsched/src/hooks.c	2011/08/11 12:56:53	1.1.1.1.2.2
+++ libaitsched/src/hooks.c	2011/08/11 22:55:28	1.1.1.1.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.1.1.1.2.2 2011/08/11 12:56:53 misho Exp $
+* $Id: hooks.c,v 1.1.1.1.2.4 2011/08/11 22:55:28 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -118,7 +118,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 {
 	struct sched_IO *io;
 	sched_task_t *t = task;
-	struct kevent chg[1];
+	struct kevent chg[2];
 	struct timespec timeout = { 0, 0 };
 
 	if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root))
@@ -128,20 +128,46 @@ sched_hook_cancel(void *task, void *arg __unused)
 
 	switch (t->task_type) {
 		case taskREAD:
+#ifdef __NetBSD__
+			EV_SET(&chg[1], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+			EV_SET(&chg[1], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t));
+#endif
 			if (FD_ISSET(TASK_FD(t), &io->wfd))
+#ifdef __NetBSD__
 				EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+				EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, &TASK_FD(t));
+#endif
 			else
+#ifdef __NetBSD__
 				EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
-			kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout);
+#else
+				EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t));
+#endif
+			kevent(t->task_root->root_kq, chg, 2, NULL, 0, &timeout);
 
 			FD_CLR(TASK_FD(t), &io->rfd);
 			break;
 		case taskWRITE:
+#ifdef __NetBSD__
+			EV_SET(&chg[1], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+			EV_SET(&chg[1], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t));
+#endif
 			if (FD_ISSET(TASK_FD(t), &io->rfd))
+#ifdef __NetBSD__
 				EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+				EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, &TASK_FD(t));
+#endif
 			else
+#ifdef __NetBSD__
 				EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
-			kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout);
+#else
+				EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t));
+#endif
+			kevent(t->task_root->root_kq, chg, 2, NULL, 0, &timeout);
 
 			FD_CLR(TASK_FD(t), &io->wfd);
 			break;
@@ -176,7 +202,11 @@ sched_hook_read(void *task, void *arg __unused)
 	else
 		FD_SET(TASK_FD(t), &io->rfd);
 
+#ifdef __NetBSD__
 	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, &TASK_FD(t));
+#endif
 	if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		LOGERR;
 		return (void*) -1;
@@ -209,7 +239,11 @@ sched_hook_write(void *task, void *arg __unused)
 	else
 		FD_SET(TASK_FD(t), &io->wfd);
 
+#ifdef __NetBSD__
 	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t));
+#else
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, &TASK_FD(t));
+#endif
 	if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		LOGERR;
 		return (void*) -1;