summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-16 10:13:34 +0100
committerStefan Metzmacher <metze@samba.org>2009-03-16 11:14:53 +0100
commita73bd05eec608d29888286542e9c882039b02857 (patch)
tree78886b55583239b3639febd2c0ec4c743f8f4f56 /source3
parentd0b9cc62f99a1feca68c473f3cd1e93e50ab2eab (diff)
downloadsamba-a73bd05eec608d29888286542e9c882039b02857.tar.gz
samba-a73bd05eec608d29888286542e9c882039b02857.tar.bz2
samba-a73bd05eec608d29888286542e9c882039b02857.zip
s3: only define TALLOC_ZERO if needed
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smb_macros.h2
-rw-r--r--source3/libaddns/dns.h2
2 files changed, 4 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 */
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index 57a9b6a002..a04a13bfd9 100644
--- a/source3/libaddns/dns.h
+++ b/source3/libaddns/dns.h
@@ -133,7 +133,9 @@ void *talloc_zeronull(const void *context, size_t size, const char *name);
#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
/*******************************************************************
Type definitions for int16, int32, uint16 and uint32. Needed