diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-08-28 17:38:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:52 -0500 |
| commit | 45b8c41038c587b5993c6219bf6698323cf93494 (patch) | |
| tree | ecaafce4564a2e56b28afbee4e901c6b011eb995 /source4/lib/talloc/talloc.h | |
| parent | 6e4043cb05665f144d53ec0043b717889232d6e7 (diff) | |
| download | samba-45b8c41038c587b5993c6219bf6698323cf93494.tar.gz samba-45b8c41038c587b5993c6219bf6698323cf93494.tar.bz2 samba-45b8c41038c587b5993c6219bf6698323cf93494.zip | |
r17891: remove c++ warnings from talloc
metze
(This used to be commit fb73ce8d4364a1da3c320034d90c0556529c61c4)
Diffstat (limited to 'source4/lib/talloc/talloc.h')
| -rw-r--r-- | source4/lib/talloc/talloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h index 40351693fa..b904029bda 100644 --- a/source4/lib/talloc/talloc.h +++ b/source4/lib/talloc/talloc.h @@ -59,7 +59,7 @@ typedef void TALLOC_CTX; #define talloc_set_destructor(ptr, function) \ do { \ int (*_talloc_destructor_fn)(_TALLOC_TYPEOF(ptr)) = (function); \ - _talloc_set_destructor((ptr), (void *)_talloc_destructor_fn); \ + _talloc_set_destructor((ptr), (int (*)(void *))_talloc_destructor_fn); \ } while(0) /* this extremely strange macro is to avoid some braindamaged warning stupidity in gcc 4.1.x */ @@ -149,7 +149,7 @@ void *talloc_autofree_context(void); size_t talloc_get_size(const void *ctx); void *talloc_find_parent_byname(const void *ctx, const char *name); void talloc_show_parents(const void *context, FILE *file); -int talloc_is_parent(const void *context, const char *ptr); +int talloc_is_parent(const void *context, const void *ptr); #endif |