From 8f804834e2b537da5c8bc81f986143a46147b490 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Tue, 4 Apr 2000 20:09:05 +0000
Subject: [PATCH] moved logging typedefs from <isc/log.h> to <isc/types.h>

---
 bin/named/client.c               |  1 +
 bin/named/include/named/client.h |  1 -
 lib/isc/include/isc/log.h        | 21 ++++++---------------
 lib/isc/include/isc/types.h      |  4 ++++
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/bin/named/client.c b/bin/named/client.c
index 46bd229733..1096c987db 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include <isc/assertions.h>
+#include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/result.h>
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index f2a098ac77..29f5a10be0 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -64,7 +64,6 @@
 #include <isc/stdtime.h>
 #include <isc/buffer.h>
 #include <isc/quota.h>
-#include <isc/log.h>
 
 #include <dns/name.h>
 #include <dns/types.h>
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 87915afcbb..7c0a0650bf 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: log.h,v 1.14 2000/03/23 00:53:05 gson Exp $ */
+/* $Id: log.h,v 1.15 2000/04/04 20:08:23 gson Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
@@ -27,6 +27,7 @@
 
 #include <isc/lang.h>
 #include <isc/result.h>
+#include <isc/types.h>
 
 ISC_LANG_BEGINDECLS
 
@@ -71,33 +72,23 @@ ISC_LANG_BEGINDECLS
 #define ISC_LOG_ROLLINFINITE	(-1)
 #define ISC_LOG_ROLLNEVER	(-2)
 
-/*
- * A logging context.  Details are internal to the implementation.
- */
-typedef struct isc_log isc_log_t;
-
-/*
- * Channel configuration.  Details are internal to the implementation.
- */
-typedef struct isc_logconfig isc_logconfig_t;
-
 /*
  * Used to name the categories used by a library.  An array of isc_logcategory
  * structures names each category, and the id value is initialized by calling
  * isc_log_registercategories.
  */
-typedef struct isc_logcategory {
+struct isc_logcategory {
 	const char *name;
 	unsigned int id;
-} isc_logcategory_t;
+};
 
 /*
  * Similar to isc_logcategory above, but for all the modules a library defines.
  */
-typedef struct isc_logmodule {
+struct isc_logmodule {
 	const char *name;
 	unsigned int id;
-} isc_logmodule_t;
+};
 
 /*
  * The isc_logfile structure is initialized as part of an isc_logdestination
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 845ef51a19..ba6d5a5b87 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -45,6 +45,10 @@ typedef struct isc_bitstring		isc_bitstring_t;
 typedef struct isc_sockaddr		isc_sockaddr_t;
 typedef struct isc_netaddr		isc_netaddr_t;
 typedef struct isc_buffer		isc_buffer_t;
+typedef struct isc_log 			isc_log_t;
+typedef struct isc_logconfig		isc_logconfig_t;
+typedef struct isc_logcategory		isc_logcategory_t;
+typedef struct isc_logmodule		isc_logmodule_t;
 
 typedef void (*isc_taskaction_t)(isc_task_t *, isc_event_t *);