[packages/php.git] / php-va_copy.patch

diff -ur php-4.3.10.orig/Zend/zend.c php-4.3.10/Zend/zend.c
--- php-4.3.10.orig/Zend/zend.c	Mon Dec  6 15:35:03 2004
+++ php-4.3.10/Zend/zend.c	Fri Dec 31 15:50:44 2004
@@ -770,11 +770,7 @@
 			ALLOC_INIT_ZVAL(z_error_lineno);
 			ALLOC_INIT_ZVAL(z_context);
 			z_error_message->value.str.val = (char *) emalloc(ZEND_ERROR_BUFFER_SIZE);
-#if defined(va_copy)
 			va_copy(usr_copy, args);
-#else
-			usr_copy = args;
-#endif
 
 #ifdef HAVE_VSNPRINTF
 			vsnprintf(z_error_message->value.str.val, ZEND_ERROR_BUFFER_SIZE, format, usr_copy);
@@ -790,9 +786,7 @@
 			/* This is risky... */
 			/* z_error_message->value.str.len = vsprintf(z_error_message->value.str.val, format, args); */
 #endif
-#if defined(va_copy)
 			va_end(usr_copy);
-#endif
 			z_error_message->type = IS_STRING;
 
 			z_error_type->value.lval = type;
Commit	Line	Data
de6839e9	1	diff -ur php-4.3.10.orig/Zend/zend.c php-4.3.10/Zend/zend.c
	2	--- php-4.3.10.orig/Zend/zend.c Mon Dec 6 15:35:03 2004
	3	+++ php-4.3.10/Zend/zend.c Fri Dec 31 15:50:44 2004
	4	@@ -770,11 +770,7 @@
	5	ALLOC_INIT_ZVAL(z_error_lineno);
	6	ALLOC_INIT_ZVAL(z_context);
	7	z_error_message->value.str.val = (char *) emalloc(ZEND_ERROR_BUFFER_SIZE);
	8	-#if defined(va_copy)
	9	va_copy(usr_copy, args);
	10	-#else
	11	- usr_copy = args;
	12	-#endif
	13
	14	#ifdef HAVE_VSNPRINTF
	15	vsnprintf(z_error_message->value.str.val, ZEND_ERROR_BUFFER_SIZE, format, usr_copy);
	16	@@ -790,9 +786,7 @@
	17	/* This is risky... */
	18	/* z_error_message->value.str.len = vsprintf(z_error_message->value.str.val, format, args); */
	19	#endif
	20	-#if defined(va_copy)
	21	va_end(usr_copy);
	22	-#endif
	23	z_error_message->type = IS_STRING;
	24
	25	z_error_type->value.lval = type;