Since includes.h isn't included here, VA_COPY has to be defined here. I don't

see any include file that is guaranteed to be here, so I'm defining it
locally.  Fixes AIX and Solaris builds.
(This used to be commit ca6bb47c22385a2c32be6ac3f8d9ffbfda45359b)

diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c
index aaad55f22ad49bb7d0a26f0696096b3f90974176..cd1e63ce59fe66504f0b0101509c88bb02f46312 100644 (file)
--- a/source3/lib/snprintf.c
+++ b/source3/lib/snprintf.c
@@ -105,6 +105,14 @@
 #define SAFE_FREE(x) do { if ((x) != NULL) {free((x)); (x)=NULL;} } while(0)
 #endif
 
+#ifndef VA_COPY
+#ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) __va_copy(dest, src)
+#else
+#define VA_COPY(dest, src) (dest) = (src)
+#endif
+#endif
+
 static size_t dopr(char *buffer, size_t maxlen, const char *format, 
                   va_list args_in);
 static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,