Formatting syncup with 3.0

(This used to be commit 98881672f5c094181be7988b4d39b451f292e423)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index fba2eabbe14ce6d66cb9878a08f271fb0fd35594..fe7923cc8182d052ee2b19e7fbc031b98931050b 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1263,10 +1263,14 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(
 
 /* we need to use __va_copy() on some platforms */
 #ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) va_copy(dest, src)
+#else
+#ifdef HAVE___VA_COPY
 #define VA_COPY(dest, src) __va_copy(dest, src)
 #else
 #define VA_COPY(dest, src) (dest) = (src)
 #endif
+#endif
 
 #ifndef HAVE_TIMEGM
 time_t timegm(struct tm *tm);