Regenerated with new OL_ARG_ENABLE

[openldap] / include / avl.h

diff --git a/include/avl.h b/include/avl.h
index 7bc62b0552dc4f5e27bada91c57cc3e3cb243a7d..458f99fd483bcf5798a0c4019bb4504e9a9b54c5 100644 (file)
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,16 +1,19 @@
+/* avl.h - avl tree definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1993 Regents of the University of Michigan.
+/* Portions Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -20,7 +23,6 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
-/* avl.h - avl tree definitions */
 
 
 #ifndef _AVL
@@ -36,7 +38,6 @@ LDAP_BEGIN_DECL
 
 typedef struct avlnode Avlnode;
 
-#ifdef AVL_INTERNAL
 struct avlnode {
        void*           avl_data;
        signed int              avl_bf;
@@ -44,6 +45,8 @@ struct avlnode {
        struct avlnode  *avl_right;
 };
 
+#ifdef AVL_INTERNAL
+
 #define NULLAVL        ((Avlnode *) NULL)
 
 /* balance factor values */
@@ -74,6 +77,9 @@ avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
 LDAP_AVL_F( void* )
 avl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
 
+LDAP_AVL_F( Avlnode* )
+avl_find2 LDAP_P((Avlnode *, const void*, AVL_CMP));
+
 LDAP_AVL_F( void* )
 avl_find_lin LDAP_P((Avlnode *, const void*, AVL_CMP));