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 b7f65235e58102ffa24a96386e03865ea4aac039..3125d3c178abc9f377fe9531ab6b286234cad680 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -173,6 +173,14 @@ 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 "zend_alloc.h"
 #include "zend_stack.h"

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 51a6c159c7cd239a0afe78580d8809cad7b16ab0..417577cc52af75cf8bb7b0f1052d384e806a60cf 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -158,5 +158,3 @@
 # define _USE_32BIT_TIME_T 1
 #endif
 #define HAVE_STDLIB_H 1
-
-#define va_copy(ap1, ap2) memcpy((&ap1), (&ap2), sizeof(va_list))