From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 24 Nov 2019 05:06:28 +0000 (-0500)
Subject: More checks for talloc_pooled_object
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19bd6dc6cd2fbce3f9bf869ccc7e17eb60a8506;p=thirdparty%2Ffreeradius-server.git

More checks for talloc_pooled_object
---

diff --git a/src/lib/util/talloc.h b/src/lib/util/talloc.h
index c319e7fe961..7f4b61017d3 100644
--- a/src/lib/util/talloc.h
+++ b/src/lib/util/talloc.h
@@ -45,7 +45,7 @@ TALLOC_CTX	*talloc_page_aligned_pool(TALLOC_CTX *ctx, void **start, void **end,
 /*
  *	Add variant that zeroes out newly allocated memory
  */
-#ifdef HAVE__TALLOC_POOLED_OBJECT
+#if defined(HAVE__TALLOC_POOLED_OBJECT) && defined(talloc_pooled_object)
 #  define HAVE_TALLOC_ZERO_POOLED_OBJECT	1
 #  define HAVE_TALLOC_POOLED_OBJECT		1
 
@@ -71,6 +71,7 @@ static inline TALLOC_CTX *_talloc_zero_pooled_object(const void *ctx,
 #else
 #  define	talloc_zero_pooled_object(_ctx, _type, _num_subobjects, _total_subobjects_size) \
 		talloc_zero(_ctx, _type)
+#undef talloc_pooled_object
 #  define	talloc_pooled_object(_ctx, _type, _num_subobjects, _total_subobjects_size) \
 		talloc(_ctx, _type)
 #endif