Author: jra Date: 2007-08-29 04:06:09 +0000 (Wed, 29 Aug 2007) New Revision: 24764
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24764 Log: Fix second TALLOC_SIZE definition. Still watching the build farm to see I didn't stuff this up... Jeremy. Modified: branches/SAMBA_3_2/source/libaddns/dns.h branches/SAMBA_3_2_0/source/libaddns/dns.h Changeset: Modified: branches/SAMBA_3_2/source/libaddns/dns.h =================================================================== --- branches/SAMBA_3_2/source/libaddns/dns.h 2007-08-29 02:01:56 UTC (rev 24763) +++ branches/SAMBA_3_2/source/libaddns/dns.h 2007-08-29 04:06:09 UTC (rev 24764) @@ -116,7 +116,7 @@ #define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__) #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type) #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type) -#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__) +#define TALLOC_SIZE(ctx, size) talloc_named_const(ctx, size, __location__) #define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__) #endif Modified: branches/SAMBA_3_2_0/source/libaddns/dns.h =================================================================== --- branches/SAMBA_3_2_0/source/libaddns/dns.h 2007-08-29 02:01:56 UTC (rev 24763) +++ branches/SAMBA_3_2_0/source/libaddns/dns.h 2007-08-29 04:06:09 UTC (rev 24764) @@ -116,7 +116,7 @@ #define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__) #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type) #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type) -#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__) +#define TALLOC_SIZE(ctx, size) talloc_named_const(ctx, size, __location__) #define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__) #endif
