130. [cleanup] <isc/condition.h> does not need <pthread.h> or

<isc/boolean.h>, and now includes <isc/types.h>
                        instead of <isc/time.h>.
(does not need pthread.h because it *does* need isc/mutex.h, which
will be guaranteed to provide pthread.h)

lib/isc/pthreads/condition.c

@@ -20,21 +20,20 @@
 #include <errno.h>
 #include <string.h>
 
-#include <isc/assertions.h>
 #include <isc/condition.h>
 #include <isc/error.h>
+#include <isc/time.h>
 #include <isc/util.h>
 
 isc_result_t
-isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t)
-{
+isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) {
 	int presult;
 	struct timespec ts;
 
 	REQUIRE(c != NULL && m != NULL && t != NULL);
 
-	ts.tv_sec = t->seconds;
-	ts.tv_nsec = t->nanoseconds;
+	ts.tv_sec = isc_time_seconds(t);
+	ts.tv_nsec = isc_time_nanoseconds(t);
 	do {
 		presult = pthread_cond_timedwait(c, m, &ts);
 		if (presult == 0)

lib/isc/pthreads/include/isc/condition.h

@@ -18,15 +18,10 @@
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1
 
-#include <pthread.h>
-
-#include <isc/boolean.h>
-#include <isc/result.h>
-#include <isc/mutex.h>
-#include <isc/time.h>
 #include <isc/lang.h>
-
-ISC_LANG_BEGINDECLS
+#include <isc/mutex.h>
+#include <isc/result.h>
+#include <isc/types.h>
 
 typedef pthread_cond_t isc_condition_t;
 
@@ -50,8 +45,10 @@ typedef pthread_cond_t isc_condition_t;
 	((pthread_cond_destroy((cp)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
 
-isc_result_t isc_condition_waituntil(isc_condition_t *, isc_mutex_t *,
-				     isc_time_t *);
+ISC_LANG_BEGINDECLS
+
+isc_result_t
+isc_condition_waituntil(isc_condition_t *, isc_mutex_t *, isc_time_t *);
 
 ISC_LANG_ENDDECLS
 

lib/isc/timer.c

@@ -20,14 +20,13 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <isc/assertions.h>
 #include <isc/condition.h>
-#include <isc/error.h>
 #include <isc/heap.h>
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/task.h>
 #include <isc/thread.h>
+#include <isc/time.h>
 #include <isc/timer.h>
 #include <isc/util.h>