svn commit: samba r8684 - in branches/SAMBA_4_0/source/lib/appweb/mpr: .

tridge at samba.org tridge at samba.org
Thu Jul 21 14:00:52 GMT 2005


Author: tridge
Date: 2005-07-21 14:00:51 +0000 (Thu, 21 Jul 2005)
New Revision: 8684

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8684

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


Modified:
   branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c
===================================================================
--- branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c	2005-07-21 13:47:21 UTC (rev 8683)
+++ branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c	2005-07-21 14:00:51 UTC (rev 8684)
@@ -330,7 +330,9 @@
 	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 @@
 	}
 
 	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;



More information about the samba-cvs mailing list