diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-08-20 13:36:33 +0200 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-08-24 16:29:58 +1000 |
commit | 5760edeeb6b6d5a8aaebae2422ba3e7c3df700cc (patch) | |
tree | e7f7b4cf7061f5cb976d175daecb0f7418e2936b | |
parent | 8a90c8bc98a2501da41af132512d1c3875463102 (diff) | |
download | samba-5760edeeb6b6d5a8aaebae2422ba3e7c3df700cc.tar.gz samba-5760edeeb6b6d5a8aaebae2422ba3e7c3df700cc.tar.bz2 samba-5760edeeb6b6d5a8aaebae2422ba3e7c3df700cc.zip |
talloc: remove ABI compat functions
metze
-rw-r--r-- | lib/talloc/talloc.c | 28 | ||||
-rw-r--r-- | lib/talloc/talloc.h | 3 |
2 files changed, 0 insertions, 31 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 50dae3b947..b5dcfca74c 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -1921,31 +1921,3 @@ int talloc_is_parent(const void *context, const void *ptr) } return 0; } - - - - -/* ABI compat functions (do NOT append anything beyond thess functions, - * keep them as the last ones in the file) */ - -static const char *talloc_ABI_compat_location = "Called from compatibility function"; - -/* ABI compat function (don't use) */ -void *_talloc_reference(const void *context, const void *ptr) { - return _talloc_reference_loc(context, ptr, talloc_ABI_compat_location); -} - -/* ABI compat function (don't use) */ -void *_talloc_steal(const void *new_ctx, const void *ptr) -{ - return _talloc_steal_internal(new_ctx, ptr); -} - -#undef talloc_free -int talloc_free(void *ptr); -int talloc_free(void *ptr) -{ - return _talloc_free_internal(ptr); -} - -/* DO NOT APPEND ANYTHING BEYOND THIS POINT */ diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h index 234c0b442c..54be1699dc 100644 --- a/lib/talloc/talloc.h +++ b/lib/talloc/talloc.h @@ -192,7 +192,4 @@ void talloc_set_abort_fn(void (*abort_fn)(const char *reason)); void talloc_set_log_fn(void (*log_fn)(const char *message)); void talloc_set_log_stderr(void); -/* for ABI compatibility, never use in new code */ -void *_talloc_reference(const void *context, const void *ptr); -void *_talloc_steal(const void *new_ctx, const void *ptr); #endif |