--- libaitsched/src/hooks.c	2012/05/31 14:45:10	1.7.2.2
+++ libaitsched/src/hooks.c	2012/05/31 22:31:48	1.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.7.2.2 2012/05/31 14:45:10 misho Exp $
+* $Id: hooks.c,v 1.8 2012/05/31 22:31:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,15 +156,17 @@ 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;
+#ifdef EVFILT_USER
 		case taskUSER:
 #ifdef __NetBSD__
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
 #else
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
+#endif
 			break;
 		default:
-			return (void*) -1;
+			return NULL;
 	}
 
 	kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
@@ -386,6 +388,7 @@ sched_hook_signal(void *task, void *arg __unused)
  * @arg = unused
  * return: <0 errors and 0 ok
  */
+#ifdef EVFILT_USER
 void *
 sched_hook_user(void *task, void *arg __unused)
 {
@@ -413,6 +416,7 @@ sched_hook_user(void *task, void *arg __unused)
 
 	return NULL;
 }
+#endif
 
 /*
  * sched_hook_fetch() - Default FETCH hook
@@ -648,7 +652,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
 					else {
-						TASK_DATA(task) = (void*) res[i].data;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
 						TASK_DATLEN(task) = res[i].fflags;
 					}
 					/* remove node handle */
@@ -675,7 +679,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
 					else {
-						TASK_DATA(task) = (void*) res[i].data;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
 						TASK_DATLEN(task) = res[i].fflags;
 					}
 					/* remove proc handle */
@@ -720,6 +724,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					break;
 				}
 				break;
+#ifdef EVFILT_USER
 			case EVFILT_USER:
 				TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
@@ -747,6 +752,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					break;
 				}
 				break;
+#endif
 		}
 		if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
 			if (r->root_hooks.hook_exec.exception) {