From 9b9f058edb033c999c4430add4f05459ac43c9e2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Sep 2006 12:18:44 +0000
Subject: [PATCH] r18521: implement volkers suggestion for avoiding the type
 punning warnings

---
 source/lib/talloc/talloc.c | 3 ++-
 source/lib/talloc/talloc.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c
index 2b80594e801..d790c6c26bb 100644
--- a/source/lib/talloc/talloc.c
+++ b/source/lib/talloc/talloc.c
@@ -741,8 +741,9 @@ void *_talloc_steal(const void *new_ctx, const void *ptr)
   a wrapper around talloc_steal() for situations where you are moving a pointer
   between two structures, and want the old pointer to be set to NULL
 */
-void *_talloc_move(const void *new_ctx, const void **pptr)
+void *_talloc_move(const void *new_ctx, const void *_pptr)
 {
+	const void **pptr = (const void **)_pptr;
 	void *ret = _talloc_steal(new_ctx, *pptr);
 	(*pptr) = NULL;
 	return ret;
diff --git a/source/lib/talloc/talloc.h b/source/lib/talloc/talloc.h
index 56f9dbb21ab..8b17eec03ab 100644
--- a/source/lib/talloc/talloc.h
+++ b/source/lib/talloc/talloc.h
@@ -73,7 +73,7 @@ typedef void TALLOC_CTX;
 #endif
 
 #define talloc_reference(ctx, ptr) (_TALLOC_TYPEOF(ptr))_talloc_reference((ctx),(ptr))
-#define talloc_move(ctx, ptr) (_TALLOC_TYPEOF(*(ptr)))_talloc_move((ctx),(const void **)(ptr))
+#define talloc_move(ctx, ptr) (_TALLOC_TYPEOF(*(ptr)))_talloc_move((ctx),(void *)(ptr))
 
 /* useful macros for creating type checked pointers */
 #define talloc(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
@@ -128,7 +128,7 @@ int talloc_free(void *ptr);
 void talloc_free_children(void *ptr);
 void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *name);
 void *_talloc_steal(const void *new_ctx, const void *ptr);
-void *_talloc_move(const void *new_ctx, const void **pptr);
+void *_talloc_move(const void *new_ctx, const void *pptr);
 size_t talloc_total_size(const void *ptr);
 size_t talloc_total_blocks(const void *ptr);
 void talloc_report_depth_cb(const void *ptr, int depth, int max_depth,