fixed compilation with --enable-dmalloc

the macro redefinition of free() means we cannot have a structure
element called "free"
(This used to be commit d2d653a1a6db9d0407e99affb317a0045e56168a)

diff --git a/source3/include/adt_tree.h b/source3/include/adt_tree.h
index b1bf7ad85dc4db749045e5c9520360ed7ba69d67..12e2ea5cc535815e1296be197552699af76d7960 100644 (file)
--- a/source3/include/adt_tree.h
+++ b/source3/include/adt_tree.h
@@ -32,7 +32,7 @@ typedef struct _tree_node {
 typedef struct _tree_root {
        TREE_NODE       *root;
        int             (*compare)(void* x, void *y);
-       void            (*free)(void *p);
+       void            (*free_func)(void *p);
 } SORTED_TREE;
 
 #endif

diff --git a/source3/lib/adt_tree.c b/source3/lib/adt_tree.c
index 0bc224ec232c9d8fb1627e80a7590c35062401cc..bd857e205ac150dfcc944e569b7991b3cd676ade 100644 (file)
--- a/source3/lib/adt_tree.c
+++ b/source3/lib/adt_tree.c
@@ -65,7 +65,7 @@ SORTED_TREE* sorted_tree_init( void *data_p,
        ZERO_STRUCTP( tree );
        
        tree->compare = cmp_fn;
-       tree->free    = free_fn;
+       tree->free_func    = free_fn;
        
        if ( !(tree->root = (TREE_NODE*)malloc( sizeof(TREE_NODE) )) ) {
                SAFE_FREE( tree );
@@ -110,8 +110,8 @@ void sorted_tree_destroy( SORTED_TREE *tree )
        if ( tree->root )
                sorted_tree_destroy_children( tree->root );     
        
-       if ( tree->free )
-               tree->free( tree->root );
+       if ( tree->free_func )
+               tree->free_func( tree->root );
        
        SAFE_FREE( tree );
 }