summaryrefslogtreecommitdiffstats
path: root/source/lib/appweb/mpr/miniMpr.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-21 14:00:51 +0000
committerAndrew Tridgell <tridge@samba.org>2005-07-21 14:00:51 +0000
commit5ddfff7409bf24fc83060f1238cadb181777341b (patch)
tree076546fc139afb8bcff077f6eda1b17ebaab508a /source/lib/appweb/mpr/miniMpr.c
parentba0fe39f11af4cb7ab2b18c6432066a81e1a06ee (diff)
downloadsamba-5ddfff7409bf24fc83060f1238cadb181777341b.tar.gz
samba-5ddfff7409bf24fc83060f1238cadb181777341b.tar.xz
samba-5ddfff7409bf24fc83060f1238cadb181777341b.zip
r8684: this should fix the panic on x86_64, and possibly alpha
Diffstat (limited to 'source/lib/appweb/mpr/miniMpr.c')
-rw-r--r--source/lib/appweb/mpr/miniMpr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/lib/appweb/mpr/miniMpr.c b/source/lib/appweb/mpr/miniMpr.c
index abeefe1ec8e..615b46bf09b 100644
--- a/source/lib/appweb/mpr/miniMpr.c
+++ b/source/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;