From 04598d3832ef26c40c6b320e5e806f4e92947572 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 14:00:51 +0000
Subject: r8684: this should fix the panic on x86_64, and possibly alpha (This
 used to be commit c2f5884e2f8a033446467384b6c058567b2fb9ce)

---
 source4/lib/appweb/mpr/miniMpr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/lib/appweb')

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;
-- 
cgit