From 5742ed128df90db400ff825bba7a939dadac8c30 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 4 Jul 2009 10:35:21 +0200 Subject: Fix some warnings --- lib/talloc/talloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 8ccebe2e24..0126567c45 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -723,7 +723,7 @@ void *talloc_reparent(const void *old_parent, const void *new_parent, const void if (_talloc_steal_internal(new_parent, h) != h) { return NULL; } - return ptr; + return (void *)ptr; } } @@ -1183,7 +1183,7 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n void *_talloc_move(const void *new_ctx, const void *_pptr) { const void **pptr = discard_const_p(const void *,_pptr); - void *ret = talloc_steal(new_ctx, *pptr); + void *ret = talloc_steal(new_ctx, (void *)*pptr); (*pptr) = NULL; return ret; } @@ -1905,6 +1905,7 @@ void *_talloc_steal(const void *new_ctx, const void *ptr) } #undef talloc_free +int talloc_free(void *ptr); int talloc_free(void *ptr) { return _talloc_free_internal(ptr); -- cgit