--- libaitsched/src/hooks.c	2012/08/02 12:32:07	1.10.2.9
+++ libaitsched/src/hooks.c	2012/08/02 12:58:02	1.10.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.10.2.9 2012/08/02 12:32:07 misho Exp $
+* $Id: hooks.c,v 1.10.2.10 2012/08/02 12:58:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -107,9 +107,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 	sched_task_t *t = task;
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
-#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
+#ifdef AIO_SUPPORT
 	struct aiocb *acb;
-#endif
+#endif	/* AIO_SUPPORT */
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
@@ -159,7 +159,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
 			break;
-#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
+#ifdef AIO_SUPPORT
 		case taskAIO:
 #ifdef __NetBSD__
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
@@ -174,7 +174,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 				TASK_VAL(t) = 0;
 			}
 			break;
-#endif
+#endif	/* AIO_SUPPORT */
 #ifdef EVFILT_USER
 		case taskUSER:
 #ifdef __NetBSD__
@@ -454,7 +454,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct kevent evt[1], res[KQ_EVENTS];
 	register int i, flg;
 	int en;
-#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
+#ifdef AIO_SUPPORT
 	int len, fd;
 	struct aiocb *acb;
 #ifdef EVFILT_LIO
@@ -464,7 +464,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct aiocb **acbs;
 	struct iovec *iv;
 #endif	/* EVFILT_LIO */
-#endif	/* EVFILT_AIO */
+#endif	/* AIO_SUPPORT */
 
 	if (!r)
 		return NULL;
@@ -782,7 +782,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 				if (flg > 1)
 					evt->flags ^= evt->flags;
 				break;
-#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
+#ifdef AIO_SUPPORT
 			case EVFILT_AIO:
 #ifdef EVFILT_LIO
 			case EVFILT_LIO:
@@ -845,7 +845,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 				if (flg > 1)
 					evt->flags ^= evt->flags;
 				break;
-#endif	/* EVFILT_AIO */
+#endif	/* AIO_SUPPORT */
 #ifdef EVFILT_USER
 			case EVFILT_USER:
 				flg = 0;