--- libaitsched/src/hooks.c	2012/01/24 14:51:03	1.3.4.3
+++ libaitsched/src/hooks.c	2012/01/24 15:29:09	1.3.4.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.3.4.3 2012/01/24 14:51:03 misho Exp $
+* $Id: hooks.c,v 1.3.4.4 2012/01/24 15:29:09 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -295,41 +295,41 @@ retry:
 #ifdef TIMER_WITHOUT_SORT
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	timespecclear(&r->root_wait);
+	sched_timespecclear(&r->root_wait);
 	TAILQ_FOREACH(task, &r->root_timer, task_node) {
-		if (!timespecisset(&r->root_wait))
+		if (!sched_timespecisset(&r->root_wait))
 			r->root_wait = TASK_TS(task);
-		else if (timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0)
+		else if (sched_timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0)
 			r->root_wait = TASK_TS(task);
 	}
 
 	if (TAILQ_FIRST(&r->root_timer)) {
 		m = r->root_wait;
-		timespecsub(&m, &now, &mtmp);
+		sched_timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
+		sched_timespecinf(&r->root_wait);
 	}
 #else
 	if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) {
 		clock_gettime(CLOCK_MONOTONIC, &now);
 
 		m = TASK_TS(task);
-		timespecsub(&m, &now, &mtmp);
+		sched_timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
+		sched_timespecinf(&r->root_wait);
 	}
 #endif
 	/* if present member of eventLo, set NOWAIT */
 	if (TAILQ_FIRST(&r->root_eventlo))
-		timespecclear(&r->root_wait);
+		sched_timespecclear(&r->root_wait);
 
 	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1)
 		timeout = &r->root_wait;
-	else if (r->root_poll.tv_sec == -1 && r->root_poll.tv_nsec == -1)
+	else if (sched_timespecinf(&r->root_poll))
 		timeout = NULL;
 	else
 		timeout = &r->root_poll;
@@ -465,7 +465,7 @@ retry:
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	TAILQ_FOREACH(task, &r->root_timer, task_node)
-		if (timespeccmp(&now, &TASK_TS(task), -) >= 0) {
+		if (sched_timespeccmp(&now, &TASK_TS(task), -) >= 0) {
 #ifdef HAVE_LIBPTHREAD
 			pthread_mutex_lock(&r->root_mtx[taskTIMER]);
 #endif