From 7896e45912df15d07eb99f885b9d9c15ad5f3f68 Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Fri, 28 Apr 2000 04:16:34 +0000
Subject: [PATCH]  121.   [cleanup]       <isc/symtab.h> does not need
 <isc/mem.h> or                         <isc/result.h>.  Multiple inclusion
 protection                         symbol fixed from ISC_SYMBOL_H to
 ISC_SYMTAB_H.                         isc_symtab_t moved to <isc/types.h>.

---
 CHANGES                      |  5 +++++
 lib/isc/include/isc/symtab.h | 19 +++++++------------
 lib/isc/include/isc/types.h  |  1 +
 lib/isc/symtab.c             |  3 ++-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index 898aa95553..38387ab2b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+ 121.   [cleanup]       <isc/symtab.h> does not need <isc/mem.h> or
+                        <isc/result.h>.  Multiple inclusion protection
+                        symbol fixed from ISC_SYMBOL_H to ISC_SYMTAB_H.
+                        isc_symtab_t moved to <isc/types.h>.
+
  120.   [cleanup]       <isc/socket.h> does not need <isc/boolean.h>,
                         <isc/bufferlist.h>, <isc/task.h>, <isc/mem.h> or
                         <isc/net.h>.
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index 724b3d1296..77a61a1d21 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef ISC_SYMBOL_H
-#define ISC_SYMBOL_H 1
+#ifndef ISC_SYMTAB_H
+#define ISC_SYMTAB_H 1
 
 /*****
  ***** Module Info
@@ -77,11 +77,8 @@
  *** Imports.
  ***/
 
-#include <isc/mem.h>
-#include <isc/result.h>
 #include <isc/lang.h>
-
-ISC_LANG_BEGINDECLS
+#include <isc/types.h>
 
 /***
  *** Symbol Tables.
@@ -102,14 +99,12 @@ typedef enum {
 	isc_symexists_add = 2
 } isc_symexists_t;
 
-typedef struct isc_symtab		isc_symtab_t;
+ISC_LANG_BEGINDECLS
 
 isc_result_t
 isc_symtab_create(isc_mem_t *mctx, unsigned int size,
-		  isc_symtabaction_t undefine_action,
-		  void *undefine_arg,
-		  isc_boolean_t case_sensitive,
-		  isc_symtab_t **symtabp);
+		  isc_symtabaction_t undefine_action, void *undefine_arg,
+		  isc_boolean_t case_sensitive, isc_symtab_t **symtabp);
 
 void
 isc_symtab_destroy(isc_symtab_t **symtabp);
@@ -127,4 +122,4 @@ isc_symtab_undefine(isc_symtab_t *symtab, char *key, unsigned int type);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_SYMBOL_H */
+#endif /* ISC_SYMTAB_H */
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 990cd3b2b7..a54440798b 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -67,6 +67,7 @@ typedef struct isc_sockaddr		isc_sockaddr_t;
 typedef struct isc_socket		isc_socket_t;
 typedef struct isc_socketevent		isc_socketevent_t;
 typedef struct isc_socketmgr		isc_socketmgr_t;
+typedef struct isc_symtab		isc_symtab_t;
 typedef struct isc_task			isc_task_t;
 typedef struct isc_taskmgr		isc_taskmgr_t;
 typedef struct isc_textregion		isc_textregion_t;
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 6600a0a141..aa2b09097f 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -22,7 +22,8 @@
 #include <string.h>
 
 #include <isc/assertions.h>
-#include <isc/list.h>
+#include <isc/mem.h>
+#include <isc/result.h>
 #include <isc/symtab.h>
 #include <isc/util.h>