diff options
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/sys/avl.h | 22 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/avl_impl.h | 12 |
2 files changed, 14 insertions, 20 deletions
diff --git a/usr/src/uts/common/sys/avl.h b/usr/src/uts/common/sys/avl.h index ba305c9..d7f0341 100644 --- a/usr/src/uts/common/sys/avl.h +++ b/usr/src/uts/common/sys/avl.h @@ -23,8 +23,8 @@ * Use is subject to license terms. */ -#ifndef _AVL_H -#define _AVL_H +#ifndef _LIBSUNAVL_AVL_H +#define _LIBSUNAVL_AVL_H /* * This is a private header file. Applications should not directly include @@ -35,9 +35,6 @@ extern "C" { #endif -#include <sys/types.h> -#include <sys/avl_impl.h> - /* * This is a generic implemenatation of AVL trees for use in the Solaris kernel. * The interfaces provide an efficient way of implementing an ordered set of @@ -255,19 +252,19 @@ extern void avl_remove(avl_tree_t *tree, void *node); * avl_update_gt() only if you know the direction in which the order of the * node may change. */ -extern boolean_t avl_update(avl_tree_t *, void *); -extern boolean_t avl_update_lt(avl_tree_t *, void *); -extern boolean_t avl_update_gt(avl_tree_t *, void *); +extern int avl_update(avl_tree_t *, void *); +extern int avl_update_lt(avl_tree_t *, void *); +extern int avl_update_gt(avl_tree_t *, void *); /* * Return the number of nodes in the tree */ -extern ulong_t avl_numnodes(avl_tree_t *tree); +extern size_t avl_numnodes(avl_tree_t *tree); /* - * Return B_TRUE if there are zero nodes in the tree, B_FALSE otherwise. + * Return 1 if there are zero nodes in the tree, 0 otherwise. */ -extern boolean_t avl_is_empty(avl_tree_t *tree); +extern int avl_is_empty(avl_tree_t *tree); /* * Used to destroy any remaining nodes in a tree. The cookie argument should @@ -306,4 +303,5 @@ extern void avl_destroy(avl_tree_t *tree); } #endif -#endif /* _AVL_H */ +#endif /* _LIBSUNAVL_AVL_H */ + diff --git a/usr/src/uts/common/sys/avl_impl.h b/usr/src/uts/common/sys/avl_impl.h index 620685f..6a2cc08 100644 --- a/usr/src/uts/common/sys/avl_impl.h +++ b/usr/src/uts/common/sys/avl_impl.h @@ -24,18 +24,14 @@ * Use is subject to license terms. */ -#ifndef _AVL_IMPL_H -#define _AVL_IMPL_H - -#pragma ident "%Z%%M% %I% %E% SMI" +#ifndef _LIBSUNAVL_AVL_IMPL_H +#define _LIBSUNAVL_AVL_IMPL_H /* * This is a private header file. Applications should not directly include * this file. */ -#include <sys/types.h> - #ifdef __cplusplus extern "C" { #endif @@ -147,7 +143,7 @@ struct avl_tree { struct avl_node *avl_root; /* root node in tree */ int (*avl_compar)(const void *, const void *); size_t avl_offset; /* offsetof(type, avl_link_t field) */ - ulong_t avl_numnodes; /* number of nodes in the tree */ + size_t avl_numnodes; /* number of nodes in the tree */ size_t avl_size; /* sizeof user type struct */ }; @@ -161,4 +157,4 @@ extern void *avl_walk(struct avl_tree *, void *, int); } #endif -#endif /* _AVL_IMPL_H */ +#endif /* _LIBSUNAVL_AVL_IMPL_H */ |