r8684: this should fix the panic on x86_64, and possibly alpha

(This used to be commit c2f5884e2f8a033446467384b6c058567b2fb9ce)

diff --git a/source4/lib/appweb/mpr/miniMpr.c b/source4/lib/appweb/mpr/miniMpr.c
index abeefe1ec8e93419e4010f2792dd0d582bfabfe2..615b46bf09bdc2b214d23d50c53adfafaf4570dc 100644 (file)
--- 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;