diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-02 07:32:04 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-05-02 07:32:04 +1000 |
| commit | 169f12940462da90d6cdbbd1c8f170fa978d959a (patch) | |
| tree | bb9a82c2e458f6149939720e9291f9e2b05985bd /ctdb/lib/talloc/talloc.h | |
| parent | 3a05ad1402c20df868abb2aeb56a6d9e3be1f884 (diff) | |
| download | samba-169f12940462da90d6cdbbd1c8f170fa978d959a.tar.gz samba-169f12940462da90d6cdbbd1c8f170fa978d959a.tar.xz samba-169f12940462da90d6cdbbd1c8f170fa978d959a.zip | |
merge latest versions of lib/replace, lib/talloc, lib/tdb and lib/events into ctdb bzr tree
(This used to be ctdb commit eaea8a9fa8d2f5e08f3af619fa1008a663f39053)
Diffstat (limited to 'ctdb/lib/talloc/talloc.h')
| -rw-r--r-- | ctdb/lib/talloc/talloc.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ctdb/lib/talloc/talloc.h b/ctdb/lib/talloc/talloc.h index bb068019cc..d9e7d94338 100644 --- a/ctdb/lib/talloc/talloc.h +++ b/ctdb/lib/talloc/talloc.h @@ -26,16 +26,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> + /* this is only needed for compatibility with the old talloc */ typedef void TALLOC_CTX; /* this uses a little trick to allow __LINE__ to be stringified */ -#define _STRING_LINE_(s) #s -#define _STRING_LINE2_(s) _STRING_LINE_(s) -#define __LINESTR__ _STRING_LINE2_(__LINE__) -#define __location__ __FILE__ ":" __LINESTR__ +#ifndef __location__ +#define __TALLOC_STRING_LINE1__(s) #s +#define __TALLOC_STRING_LINE2__(s) __TALLOC_STRING_LINE1__(s) +#define __TALLOC_STRING_LINE3__ __TALLOC_STRING_LINE2__(__LINE__) +#define __location__ __FILE__ ":" __TALLOC_STRING_LINE3__ +#endif #ifndef TALLOC_DEPRECATED #define TALLOC_DEPRECATED 0 @@ -142,7 +148,6 @@ void talloc_report_depth_file(const void *ptr, int depth, int max_depth, FILE *f void talloc_report_full(const void *ptr, FILE *f); void talloc_report(const void *ptr, FILE *f); void talloc_enable_null_tracking(void); -void talloc_report_null_full(void); void talloc_disable_null_tracking(void); void talloc_enable_leak_report(void); void talloc_enable_leak_report_full(void); @@ -166,4 +171,3 @@ void talloc_show_parents(const void *context, FILE *file); int talloc_is_parent(const void *context, const void *ptr); #endif - |