From 49a15f0bd42385d931c768643f9bffcd2f19d278 Mon Sep 17 00:00:00 2001 From: Scott MacVicar Date: Sat, 22 Nov 2008 15:16:47 +0000 Subject: [PATCH] MFH Better fix for va_copy since some architectures like to do a deep copy. --- main/php.h | 7 +++++++ win32/build/config.w32.h.in | 2 -- 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)) -- 2.40.0