com php-src: Fix intl build: Zend/zend_execute.h
| From: | Nikita Popov | Date: | Thu, 22 Aug 2013 09:46:51 +0000 |
| Subject: | com php-src: Fix intl build: Zend/zend_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73070@lists.php.net to get a copy of this message | ||
Commit: 592677d810feba294c962a1b0191adeea08b6d46
Author: Nikita Popov <nikic@php.net> Thu, 22 Aug 2013 11:46:51 +0200
Parents: fc16b923135bf1670f6791d3998aeb19edde1ca5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=592677d810feba294c962a1b0191adeea08b6d46
Log:
Fix intl build
Turns out that you can't use implicit void pointer casts if intl
is compiled.
Changed paths:
M Zend/zend_execute.h
Diff:
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 35c5bca..ff07587 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -293,7 +293,7 @@ static zend_always_inline void zend_vm_stack_clear_multiple(int nested TSRMLS_DC
void **end = p - (int)(zend_uintptr_t)*p;
while (p != end) {
- zval *q = *(--p);
+ zval *q = (zval *) *(--p);
*p = NULL;
i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
}