cleanup old TOOLID macro

[openldap] / include / avl.h

diff --git a/include/avl.h b/include/avl.h
index aa9f58f66f23e3952791411640a83afb06746b81..7ecb3affe55f79536eb2e3a0fe85d2f6689559a6 100644 (file)
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -37,7 +38,7 @@ typedef struct avlnode Avlnode;
 #ifdef AVL_INTERNAL
 struct avlnode {
        void*           avl_data;
-       signed char             avl_bf;
+       signed int              avl_bf;
        struct avlnode  *avl_left;
        struct avlnode  *avl_right;
 };
@@ -48,50 +49,51 @@ struct avlnode {
 #define LH     (-1)
 #define EH     0
 #define RH     1
-#endif
 
 /* avl routines */
 #define avl_getone(x)  ((x) == 0 ? 0 : (x)->avl_data)
 #define avl_onenode(x) ((x) == 0 || ((x)->avl_left == 0 && (x)->avl_right == 0))
 
+#endif /* AVL_INTERNALS */
+
 typedef int            (*AVL_APPLY) LDAP_P((void *, void*));
-typedef int            (*AVL_CMP) LDAP_P((void*, void*));
+typedef int            (*AVL_CMP) LDAP_P((const void*, const void*));
 typedef int            (*AVL_DUP) LDAP_P((void*, void*));
 typedef void   (*AVL_FREE) LDAP_P((void*));
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
 
-LDAP_F( void* )
+LIBAVL_F( void* )
 avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
 
-LDAP_F( void* )
-avl_find LDAP_P((Avlnode *, void*, AVL_CMP));
+LIBAVL_F( void* )
+avl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
 
-LDAP_F( void* )
-avl_find_lin LDAP_P((Avlnode *, void*, AVL_CMP));
+LIBAVL_F( void* )
+avl_find_lin LDAP_P((Avlnode *, const void*, AVL_CMP));
 
 #ifdef AVL_NONREENTRANT
-LDAP_F( void* )
+LIBAVL_F( void* )
 avl_getfirst LDAP_P((Avlnode *));
 
-LDAP_F( void* )
+LIBAVL_F( void* )
 avl_getnext LDAP_P((void));
 #endif
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_dup_error LDAP_P((void*, void*));
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_dup_ok LDAP_P((void*, void*));
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
 
-LDAP_F( int )
+LIBAVL_F( int )
 avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
 
 /* apply traversal types */