summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-21 14:00:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:54 -0500
commit04598d3832ef26c40c6b320e5e806f4e92947572 (patch)
tree41240307be4f186a8feed0ecd778db67c78fc691
parent5086945689f10db74fbb2a4340c7e22469f9e8d8 (diff)
downloadsamba-04598d3832ef26c40c6b320e5e806f4e92947572.tar.gz
samba-04598d3832ef26c40c6b320e5e806f4e92947572.tar.bz2
samba-04598d3832ef26c40c6b320e5e806f4e92947572.zip
r8684: this should fix the panic on x86_64, and possibly alpha
(This used to be commit c2f5884e2f8a033446467384b6c058567b2fb9ce)
-rw-r--r--source4/lib/appweb/mpr/miniMpr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.c b/source4/lib/appweb/mpr/miniMpr.c
index abeefe1ec8..615b46bf09 100644
--- a/source4/lib/appweb/mpr/miniMpr.c
+++ b/source4/lib/appweb/mpr/miniMpr.c
@@ -330,7 +330,9 @@ static int mprCoreStrcat(int alloc, char **destp, int destMax, int existingLen,
dest = *destp;
sepLen = (delim) ? strlen(delim) : 0;
-#ifdef __va_copy
+#ifdef HAVE_VA_COPY
+ va_copy(ap, args);
+#elif HAVE___VA_COPY
__va_copy(ap, args);
#else
ap = args;
@@ -368,7 +370,9 @@ static int mprCoreStrcat(int alloc, char **destp, int destMax, int existingLen,
}
if (addBytes > 0) {
-#ifdef __va_copy
+#ifdef HAVE_VA_COPY
+ va_copy(ap, args);
+#elif HAVE___VA_COPY
__va_copy(ap, args);
#else
ap = args;