From 801dceea23d11975f5a5ae6ccbdf1dbde6b7af13 Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Tue, 26 Dec 2000 21:45:08 +0000
Subject: [PATCH] Revert my last change.  It was stupid, which I if I had been
 thinking clearly I would have seen *before* I commited anything.  So, include
 isc/thread.h, isc/mutex.h and isc/condition.h even if ISC_PLATFORM_USETHREADS
 is not defined.

(What caused me to bother with this at all was a problem that I resolved
a few days ago by fixing configure ... though now that I think about it,
that probably means there is some other latent problem with inconsistent
definitions that could maybe be handled better.  I'll look into it more
later, AFTER vacation.)
---
 lib/isc/task.c        |  9 ++++-----
 lib/isc/timer.c       |  9 ++++-----
 lib/isc/unix/app.c    |  6 +++---
 lib/isc/unix/socket.c | 11 +++++------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/isc/task.c b/lib/isc/task.c
index d0e5f4d32d..c4c6846c84 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.77 2000/12/26 21:12:21 tale Exp $ */
+/* $Id: task.c,v 1.78 2000/12/26 21:45:04 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -28,18 +28,17 @@
 
 #include <config.h>
 
+#include <isc/condition.h>
 #include <isc/event.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
 #include <isc/platform.h>
 #include <isc/string.h>
 #include <isc/task.h>
+#include <isc/thread.h>
 #include <isc/util.h>
 
-#ifdef ISC_PLATFORM_USETHREADS
-#include <isc/condition.h>
-#include <isc/thread.h>
-#else /* ISC_PLATFORM_USETHREADS */
+#ifndef ISC_PLATFORM_USETHREADS
 #include "task_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 1dbf74751b..449ea18195 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,23 +15,22 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.60 2000/12/26 21:12:23 tale Exp $ */
+/* $Id: timer.c,v 1.61 2000/12/26 21:45:05 tale Exp $ */
 
 #include <config.h>
 
+#include <isc/condition.h>
 #include <isc/heap.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
 #include <isc/platform.h>
 #include <isc/task.h>
+#include <isc/thread.h>
 #include <isc/time.h>
 #include <isc/timer.h>
 #include <isc/util.h>
 
-#ifdef ISC_PLATFORM_USETHREADS
-#include <isc/condition.h>
-#include <isc/thread.h>
-#else /* ISC_PLATFORM_USETHREADS */
+#ifndef ISC_PLATFORM_USETHREADS
 #include "timer_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */
 
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index a251f42575..3676d25174 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.35 2000/12/26 21:12:24 tale Exp $ */
+/* $Id: app.c,v 1.36 2000/12/26 21:45:06 tale Exp $ */
 
 #include <config.h>
 
@@ -29,7 +29,9 @@
 
 #include <isc/app.h>
 #include <isc/boolean.h>
+#include <isc/condition.h>
 #include <isc/msgs.h>
+#include <isc/mutex.h>
 #include <isc/event.h>
 #include <isc/platform.h>
 #include <isc/string.h>
@@ -39,8 +41,6 @@
 
 #ifdef ISC_PLATFORM_USETHREADS
 #include <pthread.h>
-#include <isc/condition.h>
-#include <isc/mutex.h>
 #else /* ISC_PLATFORM_USETHREADS */
 #include "../timer_p.h"
 #include "../task_p.h"
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index fc5d81183a..8d582f6e85 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.177 2000/12/26 21:12:25 tale Exp $ */
+/* $Id: socket.c,v 1.178 2000/12/26 21:45:08 tale Exp $ */
 
 #include <config.h>
 
@@ -34,23 +34,22 @@
 
 #include <isc/buffer.h>
 #include <isc/bufferlist.h>
+#include <isc/condition.h>
 #include <isc/list.h>
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
+#include <isc/mutex.h>
 #include <isc/net.h>
 #include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/socket.h>
 #include <isc/task.h>
+#include <isc/thread.h>
 #include <isc/util.h>
 
-#ifdef ISC_PLATFORM_USETHREADS
-#include <isc/condition.h>
-#include <isc/mutex.h>
-#include <isc/thread.h>
-#else /* ISC_PLATFORM_USETHREADS */
+#ifndef ISC_PLATFORM_USETHREADS
 #include "socket_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */