summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-12 22:30:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:47 -0500
commitc710c0671fad507b07cbc2094244fe6f2f909955 (patch)
tree8e5a1da6b298b97b4d0f9e86067bc60ce41d6ca0 /source4
parentd9d41b57e95a941f038d2c3a0c9261e1027a6dcc (diff)
downloadsamba-c710c0671fad507b07cbc2094244fe6f2f909955.tar.gz
samba-c710c0671fad507b07cbc2094244fe6f2f909955.tar.bz2
samba-c710c0671fad507b07cbc2094244fe6f2f909955.zip
r4718: don't use the deprecated __va_copy() unless va_copy() is unavailable
(This used to be commit 603ef69be075821e3ffe2084bb5cfb0bc9cce180)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/snprintf.c2
-rw-r--r--source4/lib/talloc/talloc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/source4/lib/snprintf.c b/source4/lib/snprintf.c
index 3b04228c42..dbfb046c3d 100644
--- a/source4/lib/snprintf.c
+++ b/source4/lib/snprintf.c
@@ -83,6 +83,8 @@
#ifndef VA_COPY
#ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) va_copy(dest, src)
+#elif defined(HAVE___VA_COPY)
#define VA_COPY(dest, src) __va_copy(dest, src)
#else
#define VA_COPY(dest, src) (dest) = (src)
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c
index 4c8cc31028..e05b196592 100644
--- a/source4/lib/talloc/talloc.c
+++ b/source4/lib/talloc/talloc.c
@@ -873,6 +873,8 @@ char *talloc_strndup(const void *t, const char *p, size_t n)
#ifndef VA_COPY
#ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) va_copy(dest, src)
+#elif defined(HAVE___VA_COPY)
#define VA_COPY(dest, src) __va_copy(dest, src)
#else
#define VA_COPY(dest, src) (dest) = (src)