conforming changes for new pool

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];

bin/tests/rwlock_test.c

@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

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>

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>

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>

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

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>
 

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>

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 */
 
 /*

lib/isc/task.c

@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <isc/assertions.h>
 
 #include <isc/thread.h>

lib/isc/timer.c

@@ -1,6 +1,4 @@
 
-#include "attribute.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 

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>
 

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>