felipe Sun, 13 Sep 2009 14:42:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288293
Log:
- Fixed warnings (Kalle)
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_execute.h
U php/php-src/trunk/Zend/zend_execute.h
Modified: php/php-src/branches/PHP_5_3/Zend/zend_execute.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_execute.h 2009-09-13 13:49:10 UTC
(rev 288292)
+++ php/php-src/branches/PHP_5_3/Zend/zend_execute.h 2009-09-13 14:42:36 UTC
(rev 288293)
@@ -228,7 +228,7 @@
int extra = (ZEND_MM_ALIGNMENT -
((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) /
sizeof(void*);
if (UNEXPECTED(size + extra +
ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) >
- EG(argument_stack)->end - EG(argument_stack)->top)) {
+ (zend_uintptr_t)EG(argument_stack)->end -
(zend_uintptr_t)EG(argument_stack)->top)) {
zend_vm_stack_extend(size TSRMLS_CC);
} else {
void **old_top = EG(argument_stack)->top;
Modified: php/php-src/trunk/Zend/zend_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_execute.h 2009-09-13 13:49:10 UTC (rev
288292)
+++ php/php-src/trunk/Zend/zend_execute.h 2009-09-13 14:42:36 UTC (rev
288293)
@@ -246,7 +246,7 @@
int extra = (ZEND_MM_ALIGNMENT -
((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) /
sizeof(void*);
if (UNEXPECTED(size + extra +
ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) >
- EG(argument_stack)->end - EG(argument_stack)->top)) {
+ (zend_uintptr_t)EG(argument_stack)->end -
(zend_uintptr_t)EG(argument_stack)->top)) {
zend_vm_stack_extend(size TSRMLS_CC);
} else {
void **old_top = EG(argument_stack)->top;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
