summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-04 16:19:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:46 -0500
commit526351bed9fff47797f8baeb512207a924757716 (patch)
tree81f4f2a897ebc7e2e8b04fda083e02c4e2d335c2
parent28824fb1971afd398739723ee7c65427bd086d4b (diff)
downloadsamba-526351bed9fff47797f8baeb512207a924757716.tar.gz
samba-526351bed9fff47797f8baeb512207a924757716.tar.bz2
samba-526351bed9fff47797f8baeb512207a924757716.zip
r6613: Merge back fix for PARANOID_MALLOC checker.
Jeremy. (This used to be commit 9c8d0efbfdcf9f4558ef3c7d5623558e7142d7ad)
-rw-r--r--source3/include/smb_macros.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 53c4ad046d..7e90f01b5f 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -289,7 +289,9 @@ copy an IP address from one buffer to another
#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)
-#define PARANOID_MALLOC_CHECKER 1
+#if defined(DEVELOPER) && !defined(SMBMOUNT_MALLOC)
+# define PARANOID_MALLOC_CHECKER 1
+#endif
#if defined(PARANOID_MALLOC_CHECKER)