diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
| commit | 7f113904eba5361d963075bcea7e36fd98ca34aa (patch) | |
| tree | 2d5f22f3418a3439c306b3aaf570f52ff1d0823e /lib | |
| parent | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (diff) | |
| parent | 979a1b06d01817a01967d9137e4f70f222fa8eab (diff) | |
| download | samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.gz samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.bz2 samba-7f113904eba5361d963075bcea7e36fd98ca34aa.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/talloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h index 5c8d5c5fe2..f87564a13b 100644 --- a/lib/talloc/talloc.h +++ b/lib/talloc/talloc.h @@ -94,7 +94,7 @@ typedef void TALLOC_CTX; #define talloc_array(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type) #define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count, __location__) #define talloc_array_ptrtype(ctx, ptr, count) (_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count) -#define talloc_array_length(ctx) ((ctx) ? talloc_get_size(ctx)/sizeof(*ctx) : 0) +#define talloc_array_length(ctx) (talloc_get_size(ctx)/sizeof(*ctx)) #define talloc_realloc(ctx, p, type, count) (type *)_talloc_realloc_array(ctx, p, sizeof(type), count, #type) #define talloc_realloc_size(ctx, ptr, size) _talloc_realloc(ctx, ptr, size, __location__) |