summaryrefslogtreecommitdiffstats
path: root/avahi-common/malloc.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-10-23 23:01:13 +0000
committerLennart Poettering <lennart@poettering.net>2005-10-23 23:01:13 +0000
commit7d45167a88dceefc521bf94a618f29bfc1886932 (patch)
tree829e1cf17672149c22692b15391b440d91fd7ab5 /avahi-common/malloc.c
parentcd1f745f940537806dac843080b7ebfb8b85c067 (diff)
* gcc 2.95 compatibility
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@849 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common/malloc.c')
-rw-r--r--avahi-common/malloc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/avahi-common/malloc.c b/avahi-common/malloc.c
index 52e0962..51b8ff6 100644
--- a/avahi-common/malloc.c
+++ b/avahi-common/malloc.c
@@ -31,6 +31,14 @@
#include "malloc.h"
+#ifndef va_copy
+#ifdef __va_copy
+#define va_copy(DEST,SRC) __va_copy((DEST),(SRC))
+#else
+#define va_copy(DEST,SRC) memcpy(&(DEST), &(SRC), sizeof(va_list))
+#endif
+#endif
+
static const AvahiAllocator *allocator = NULL;
static void oom(void) AVAHI_GCC_NORETURN;
@@ -206,9 +214,7 @@ char *avahi_strdup_vprintf(const char *fmt, va_list ap) {
va_list ap2;
va_copy (ap2, ap);
-
n = vsnprintf(buf, len, fmt, ap2);
-
va_end (ap2);
if (n >= 0 && n < (int) len)