scottmac Sat Nov 22 15:16:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build config.w32.h.in
/php-src/main php.h
Log:
MFH 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.7.2.4.2.3.2.4&r2=1.7.2.4.2.3.2.5&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.4
php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.5
--- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.4 Sat Nov 22 13:34:15 2008
+++ php-src/win32/build/config.w32.h.in Sat Nov 22 15:16:47 2008
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.7.2.4.2.3.2.4 2008/11/22 13:34:15 pajoye Exp $
+ $Id: config.w32.h.in,v 1.7.2.4.2.3.2.5 2008/11/22 15:16:47 scottmac Exp
$
*/
/* Define the minimum supported version */
@@ -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))
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.8.2.10&r2=1.221.2.4.2.8.2.11&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.4.2.8.2.10
php-src/main/php.h:1.221.2.4.2.8.2.11
--- php-src/main/php.h:1.221.2.4.2.8.2.10 Fri Aug 22 12:59:46 2008
+++ php-src/main/php.h Sat Nov 22 15:16:47 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.221.2.4.2.8.2.10 2008/08/22 12:59:46 helly Exp $ */
+/* $Id: php.h,v 1.221.2.4.2.8.2.11 2008/11/22 15:16:47 scottmac Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -173,6 +173,13 @@
# 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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
