diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-02-26 02:11:31 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2004-02-26 02:11:31 +0000 |
| commit | 79d5739893dca1272b60d6566ccb728c73c4240e (patch) | |
| tree | bafa61c1d0a3c3753d4caa569b089df8bbdeaa8d /source3 | |
| parent | 863c784ef477cbdad3dfb5480b41be4b2360b758 (diff) | |
| download | samba-79d5739893dca1272b60d6566ccb728c73c4240e.tar.gz samba-79d5739893dca1272b60d6566ccb728c73c4240e.tar.bz2 samba-79d5739893dca1272b60d6566ccb728c73c4240e.zip | |
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)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/adt_tree.h | 2 | ||||
| -rw-r--r-- | source3/lib/adt_tree.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/adt_tree.h b/source3/include/adt_tree.h index b1bf7ad85d..12e2ea5cc5 100644 --- 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 0bc224ec23..bd857e205a 100644 --- 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 ); } |