From 6792dd6d22db8441bb7c4d24819b4f9291e257b1 Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 11 Dec 1998 20:38:46 +0000
Subject: [PATCH] conforming changes for new pool

---
 bin/tests/mem_test.c            | 2 +-
 bin/tests/rwlock_test.c         | 2 --
 bin/tests/sock_test.c           | 4 +---
 bin/tests/task_test.c           | 4 +---
 bin/tests/timer_test.c          | 4 +---
 lib/isc/include/isc/heap.h      | 2 +-
 lib/isc/include/isc/socket.h    | 4 ++--
 lib/isc/include/isc/task.h      | 2 +-
 lib/isc/mem.c                   | 5 ++---
 lib/isc/task.c                  | 2 --
 lib/isc/timer.c                 | 2 --
 lib/isc/unix/include/isc/time.h | 3 +++
 lib/isc/unix/socket.c           | 4 +---
 13 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/bin/tests/mem_test.c b/bin/tests/mem_test.c
index 064255a614..105aa6f050 100644
--- a/bin/tests/mem_test.c
+++ b/bin/tests/mem_test.c
@@ -8,7 +8,7 @@
 #endif
 
 #include <isc/assertions.h>
-#include "memcluster.h"
+#include <isc/mem.h>
 
 char *ptr1[50000];
 char *ptr2[50000];
diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index e05fd05d13..7ab6664a4f 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index 43220e260b..d4a7ba66d2 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -1,13 +1,11 @@
 
-#include "attribute.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
 #include <isc/assertions.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 #include <isc/task.h>
 #include <isc/thread.h>
 #include <isc/result.h>
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index 7992f239e5..5bf3a9e01c 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -1,12 +1,10 @@
 
-#include "attribute.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <isc/assertions.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 #include <isc/task.h>
 #include <isc/thread.h>
 #include <isc/result.h>
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index bb536b647d..66fb075560 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -1,12 +1,10 @@
 
-#include "attribute.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <isc/assertions.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 #include <isc/task.h>
 #include <isc/thread.h>
 #include <isc/result.h>
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 06171db7b5..ccc6d7d336 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -17,7 +17,7 @@
 
 #include <isc/result.h>
 #include <isc/boolean.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 
 /* 
  * The comparision function returns ISC_TRUE if the first argument has
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index b9bb9f8872..a3c2fc9d86 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1,4 +1,4 @@
-/* $Id: socket.h,v 1.12 1998/12/10 16:14:05 explorer Exp $ */
+/* $Id: socket.h,v 1.13 1998/12/11 20:36:07 halley Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -50,7 +50,7 @@
 
 #include <isc/task.h>
 #include <isc/region.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 
 #include <netinet/in.h>
 
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 7d2791429f..c11caed37c 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -5,7 +5,7 @@
 #include <stddef.h>
 
 #include <isc/list.h>
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 
 #include <isc/boolean.h>
 #include <isc/result.h>
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 838af7640a..ed7f7d2fe6 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -21,18 +21,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "attribute.h"
 #include <isc/assertions.h>
 #include <isc/error.h>
 
-#include <isc/memcluster.h>
+#include <isc/mem.h>
 
 #ifndef ISC_SINGLETHREADED
 #include <isc/mutex.h>
 #endif
 
 #if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] __attribute__((unused)) = "$Id: mem.c,v 1.9 1998/12/04 20:00:13 halley Exp $";
+static char rcsid[] = "$Id: mem.c,v 1.10 1998/12/11 20:38:46 halley Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/isc/task.c b/lib/isc/task.c
index a26c38f4bc..063c13264d 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <isc/assertions.h>
 
 #include <isc/thread.h>
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 185c09001d..74aeeb2d02 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 2cf31fd3e5..249fd4fc69 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -2,6 +2,9 @@
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
 
+#include <sys/time.h>
+#include <time.h>
+
 #include <isc/result.h>
 #include <isc/boolean.h>
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index fe10b0104b..81e26b881a 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,6 +1,4 @@
-/* $Id: socket.c,v 1.19 1998/12/10 16:14:04 explorer Exp $ */
-
-#include "attribute.h"
+/* $Id: socket.c,v 1.20 1998/12/11 20:36:01 halley Exp $ */
 
 #include <errno.h>
 #include <stddef.h>