summaryrefslogtreecommitdiffstats
path: root/lib/talloc
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-12-05 08:36:13 +0100
committerStefan Metzmacher <metze@samba.org>2014-05-16 17:21:04 +0200
commiteb95fc8866dd1710b4cc2f4a4e1dc9867424def2 (patch)
tree3ce43ec5beb69bee42f65fabd695e46cfa231c77 /lib/talloc
parentb9fcfc6399eab750880ee0b9806311dd351a8ff6 (diff)
downloadsamba-eb95fc8866dd1710b4cc2f4a4e1dc9867424def2.tar.gz
samba-eb95fc8866dd1710b4cc2f4a4e1dc9867424def2.tar.xz
samba-eb95fc8866dd1710b4cc2f4a4e1dc9867424def2.zip
talloc: check for TALLOC_GET_TYPE_ABORT_NOOP
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/talloc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 0d47d23b2f..5ece54ddaa 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -761,7 +761,11 @@ type *talloc_get_type(const void *ptr, #type);
*/
void *talloc_get_type_abort(const void *ptr, #type);
#else
+#ifdef TALLOC_GET_TYPE_ABORT_NOOP
+#define talloc_get_type_abort(ptr, type) (type *)(ptr)
+#else
#define talloc_get_type_abort(ptr, type) (type *)_talloc_get_type_abort(ptr, #type, __location__)
+#endif
void *_talloc_get_type_abort(const void *ptr, const char *name, const char *location);
#endif