diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-13 21:25:09 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-13 21:25:09 +0000 |
| commit | 4f0a5e7572a4257894b4bfede42c26d65152609e (patch) | |
| tree | 21e3d5ee20716739590e5931859a4c2052161395 /avahi-common/malloc.h | |
| parent | d6d7d3769441b73ffb5b7af34fef823b41e66312 (diff) | |
* strip glib from avahi-core
* implement glib memory allocator
* add new documentation file MALLOC
* initialize pseudo-RNG from /dev/urandom in avahi-daemon
* remove some gcc 4.0 warnings
* beef up watch system with real timeouts
* move GCC __attribute__ macros into its own header avahi-common/gccmacro.h
* make use of GCC's sentinel attribute where it make sense
* add malloc() implementations that abort on OOM and enable them by default
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common/malloc.h')
| -rw-r--r-- | avahi-common/malloc.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h index b658357..6d10226 100644 --- a/avahi-common/malloc.h +++ b/avahi-common/malloc.h @@ -28,6 +28,7 @@ #include <stdarg.h> #include <avahi-common/cdecl.h> +#include <avahi-common/gccmacro.h> AVAHI_C_DECL_BEGIN @@ -73,12 +74,8 @@ struct AvahiAllocator { * allocators. The structure is not copied! */ void avahi_set_allocator(const AvahiAllocator *a); -#ifdef __GNUC__ -char *avahi_strdup_printf(const char *fmt, ... ) __attribute__ ((format(printf, 1, 2))); -#else /** Like sprintf() but store the result in a freshly allocated buffer. Free this with avahi_free() */ -char *avahi_strdup_printf(const char *fmt, ... ); -#endif +char *avahi_strdup_printf(const char *fmt, ... ) AVAHI_GCC_PRINTF_ATTR12; /** Same as avahi_strdup_printf() but take a va_list instead of varargs */ char *avahi_strdup_vprintf(const char *fmt, va_list ap); |