MFH Better fix for va_copy since some architectures like to do a deep copy.

diff --git a/main/php.h b/main/php.h
index f2fb416231b087fe64c30f2797eb5e84b54e23e6..3ba13179660b5b9e7b9a9e33e3d9c72207ba1e5e 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -173,6 +173,13 @@ typedef unsigned int socklen_t;
 # endif
 #endif
 
+#ifndef va_copy
+# ifdef __va_copy
+#  define va_copy(ap1, ap2)         __va_copy((ap1), (ap2))
+# else
+#  define va_copy(ap1, ap2)         memcpy((&ap1), (&ap2), sizeof(va_list))
+# endif
+#endif
 
 #include "zend_hash.h"
 #include "php3_compat.h"

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 05f383b8206b5521173f8c3a906f09f55c01da31..820fe3fe8f775445bf87f5a61b15d877414ce837 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -159,5 +159,3 @@
 # define _USE_32BIT_TIME_T 1
 #endif
 #define HAVE_STDLIB_H 1
-
-#define va_copy(ap1, ap2) memcpy((&ap1), (&ap2), sizeof(va_list))