scottmac Sat Nov 22 15:16:42 2008 UTC
Modified files:
/php-src/win32/build config.w32.h.in
/php-src/main php.h
Log:
Better fix for va_copy since some architectures like to do a deep copy.
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.19&r2=1.20&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.19
php-src/win32/build/config.w32.h.in:1.20
--- php-src/win32/build/config.w32.h.in:1.19 Sat Nov 22 13:39:04 2008
+++ php-src/win32/build/config.w32.h.in Sat Nov 22 15:16:42 2008
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.19 2008/11/22 13:39:04 pajoye Exp $
+ $Id: config.w32.h.in,v 1.20 2008/11/22 15:16:42 scottmac Exp $
*/
/* Define the minimum supported version */
@@ -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))
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.249&r2=1.250&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.249 php-src/main/php.h:1.250
--- php-src/main/php.h:1.249 Fri Aug 22 12:59:38 2008
+++ php-src/main/php.h Sat Nov 22 15:16:42 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.249 2008/08/22 12:59:38 helly Exp $ */
+/* $Id: php.h,v 1.250 2008/11/22 15:16:42 scottmac Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -173,6 +173,14 @@
# 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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
