X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Favl.h;h=458f99fd483bcf5798a0c4019bb4504e9a9b54c5;hb=4fcab959c02ef360373e055f8a739f16286e8112;hp=deb79950c3402408e30f0fbc8442825964621d64;hpb=0991e22550247e142a5e10dee3c7e29dbb8af7e1;p=openldap

diff --git a/include/avl.h b/include/avl.h
index deb79950c3..458f99fd48 100644
--- a/include/avl.h
+++ b/include/avl.h
@@ -1,15 +1,19 @@
+/* avl.h - avl tree definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 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 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.
+ * 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 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
@@ -19,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
@@ -35,7 +38,6 @@ LDAP_BEGIN_DECL
 
 typedef struct avlnode Avlnode;
 
-#ifdef AVL_INTERNAL
 struct avlnode {
 	void*		avl_data;
 	signed int		avl_bf;
@@ -43,6 +45,8 @@ struct avlnode {
 	struct avlnode	*avl_right;
 };
 
+#ifdef AVL_INTERNAL
+
 #define NULLAVL	((Avlnode *) NULL)
 
 /* balance factor values */
@@ -61,48 +65,42 @@ 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*));
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBAVL_DECL
-#	define LDAP_F_PRE	extern __declspec(LIBAVL_DECL)
-#   else
-#	define LDAP_F_PRE	extern
-#   endif
-#endif
-
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
 
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
 
-LDAP_F( void* )
+LDAP_AVL_F( void* )
 avl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
 
-LDAP_F( void* )
+LDAP_AVL_F( void* )
 avl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
 
-LDAP_F( void* )
+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));
 
 #ifdef AVL_NONREENTRANT
-LDAP_F( void* )
+LDAP_AVL_F( void* )
 avl_getfirst LDAP_P((Avlnode *));
 
-LDAP_F( void* )
+LDAP_AVL_F( void* )
 avl_getnext LDAP_P((void));
 #endif
 
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_dup_error LDAP_P((void*, void*));
 
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_dup_ok LDAP_P((void*, void*));
 
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
 
-LDAP_F( int )
+LDAP_AVL_F( int )
 avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
 
 /* apply traversal types */