summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-12-05 08:36:13 +0100
committerKarolin Seeger <kseeger@samba.org>2015-03-15 22:14:08 +0100
commitf2396a6ee2adcb9ab68e91995cbe44dac7381cea (patch)
tree44173aa43a751406ecd7164818ac9079ba4b1139
parent51cc8768d6421737624e08fb2c5305717586cc43 (diff)
downloadsamba-f2396a6ee2adcb9ab68e91995cbe44dac7381cea.tar.gz
talloc: check for TALLOC_GET_TYPE_ABORT_NOOP
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit eb95fc8866dd1710b4cc2f4a4e1dc9867424def2)
-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 0d47d23b2ff..5ece54ddaa4 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