diff options
| author | Scott MacVicar <scottmac@php.net> | 2008-11-22 15:16:42 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2008-11-22 15:16:42 +0000 |
| commit | aceb9694babc2396af6a59248411875afbb6fef8 (patch) | |
| tree | 583401219281976c38c952eeb2d2e7afb16c4806 | |
| parent | 978f5533082b3048a118aa5bc3a580cff7e85ada (diff) | |
| download | php-git-aceb9694babc2396af6a59248411875afbb6fef8.tar.gz | |
Better fix for va_copy since some architectures like to do a deep copy.
| -rw-r--r-- | main/php.h | 8 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index b7f65235e5..3125d3c178 100644 --- 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 51a6c159c7..417577cc52 100644 --- 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)) |