diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-17 14:19:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-17 14:19:25 +1100 |
| commit | 467cc6927f57e36ce9b97131e72b79ef6e39a668 (patch) | |
| tree | 7ba399896c9c4a7bcb81543bce30d06b0ffb1a1d /source3/include/smb_macros.h | |
| parent | a1ebb850209289734b12ea966b01d295d8fc436d (diff) | |
| parent | 382d8069adcc49e351eef63d86036ae553b119a2 (diff) | |
| download | samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.tar.gz samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.tar.bz2 samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/smb_macros.h')
| -rw-r--r-- | source3/include/smb_macros.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index fd1bba16a7..22cfaaf581 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -256,7 +256,9 @@ NULL returns on zero request. JRA. #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__) #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type) #define talloc_destroy(ctx) talloc_free(ctx) +#ifndef TALLOC_FREE #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) +#endif /* only define PARANOID_MALLOC_CHECKER with --enable-developer */ |