diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-12 11:45:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:46 -0500 |
| commit | 4b73689468ebe2e25a22d73fecb1a035b2303efd (patch) | |
| tree | 49737dfa133784f0a6a39b3403eb246fbb814c3a /source4/lib/talloc/talloc.h | |
| parent | 287515fd3db1932f06d56da3bb388a7efc1120eb (diff) | |
| download | samba-4b73689468ebe2e25a22d73fecb1a035b2303efd.tar.gz samba-4b73689468ebe2e25a22d73fecb1a035b2303efd.tar.bz2 samba-4b73689468ebe2e25a22d73fecb1a035b2303efd.zip | |
r4711: - deprecate talloc_destroy()
- expanded the talloc_realloc() test a little (I was concerned about a
possible bug, which turned out to be an illusion)
- don't enable gcov by default in Makefile.talloc
(This used to be commit 4ec47cc1083c4cdb780e548177631c5914bf677a)
Diffstat (limited to 'source4/lib/talloc/talloc.h')
| -rw-r--r-- | source4/lib/talloc/talloc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h index 3483bb9e71..607ca4ca47 100644 --- a/source4/lib/talloc/talloc.h +++ b/source4/lib/talloc/talloc.h @@ -4,7 +4,7 @@ Unix SMB/CIFS implementation. Samba temporary memory allocation functions - Copyright (C) Andrew Tridgell 2004 + Copyright (C) Andrew Tridgell 2004-2005 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,8 +54,6 @@ typedef void TALLOC_CTX; #define talloc_memdup(t, p, size) _talloc_memdup(t, p, size, __location__) -#define talloc_destroy(ctx) talloc_free(ctx) - #define malloc_p(type) (type *)malloc(sizeof(type)) #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count) #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count) @@ -70,6 +68,7 @@ typedef void TALLOC_CTX; #define talloc_p(ctx, type) talloc(ctx, type) #define talloc_array_p(ctx, type, count) talloc_array(ctx, type, count) #define talloc_realloc_p(ctx, p, type, count) talloc_realloc(ctx, p, type, count) +#define talloc_destroy(ctx) talloc_free(ctx) #endif #ifndef PRINTF_ATTRIBUTE |