diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-10-19 09:30:55 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-10-19 09:30:55 +1000 |
| commit | 623e216dcf02de0afbf9c5cea350818943eafdde (patch) | |
| tree | b6dba10ed3c170598be6732d49070299cd77b0b5 /ctdb/lib/talloc | |
| parent | b814462c3890432b1417d6168f0b8a6f9c0b9a8b (diff) | |
| download | samba-623e216dcf02de0afbf9c5cea350818943eafdde.tar.gz samba-623e216dcf02de0afbf9c5cea350818943eafdde.tar.xz samba-623e216dcf02de0afbf9c5cea350818943eafdde.zip | |
remove a incorrectly added file
(This used to be ctdb commit ff01a32db81b6c04d42634f5660181c270988264)
Diffstat (limited to 'ctdb/lib/talloc')
| -rw-r--r-- | ctdb/lib/talloc/talloc.h.rej | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/ctdb/lib/talloc/talloc.h.rej b/ctdb/lib/talloc/talloc.h.rej deleted file mode 100644 index 48ff66f44b..0000000000 --- a/ctdb/lib/talloc/talloc.h.rej +++ /dev/null @@ -1,36 +0,0 @@ -*************** -*** 80,106 **** - #define talloc_destroy(ctx) talloc_free(ctx) - #endif - -- #ifndef PRINTF_ATTRIBUTE -- #if (__GNUC__ >= 3) -- /** Use gcc attribute to check printf fns. a1 is the 1-based index of -- * the parameter containing the format, and a2 the index of the first -- * argument. Note that some gcc 2.x versions don't handle this -- * properly **/ -- #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) -- /* We need __typeof__ to make this type-safe. */ -- #define talloc_set_destructor(ptr, function) \ -- do { \ -- int (*_talloc_destructor_fn)(typeof(ptr)) = (function); \ -- _talloc_set_destructor((ptr), _talloc_destructor_fn); \ -- } while(0) -- #else -- #define PRINTF_ATTRIBUTE(a1, a2) -- #define talloc_set_destructor(ptr, function) \ -- _talloc_set_destructor((ptr), (int (*)(void *))(function)) -- #endif -- #endif -- -- - /* The following definitions come from talloc.c */ - void *_talloc(const void *context, size_t size); - void _talloc_set_destructor(const void *ptr, int (*destructor)(void *)); ---- 103,108 ---- - #define talloc_destroy(ctx) talloc_free(ctx) - #endif - - /* The following definitions come from talloc.c */ - void *_talloc(const void *context, size_t size); - void _talloc_set_destructor(const void *ptr, int (*destructor)(void *)); |
