summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/php.h7
-rw-r--r--win32/build/config.w32.h.in2
2 files changed, 7 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h
index f2fb416231..3ba1317966 100644
--- 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 05f383b820..820fe3fe8f 100644
--- 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))