sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

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

Browse Source 
(This used to be commit c2f5884e2f8a033446467384b6c058567b2fb9ce)
This commit is contained in:
Andrew Tridgell 2005-07-21 14:00:51 +00:00 committed by Gerald (Jerry) Carter
parent 5086945689
commit 04598d3832
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/lib/appweb/mpr/miniMpr.c
View File

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