]> granicus.if.org Git - php/commitdiff
Fix intl build
authorNikita Popov <nikic@php.net>
Thu, 22 Aug 2013 09:46:51 +0000 (11:46 +0200)
committerNikita Popov <nikic@php.net>
Thu, 22 Aug 2013 09:46:51 +0000 (11:46 +0200)
Turns out that you can't use implicit void pointer casts if intl
is compiled.

Zend/zend_execute.h

index 35c5bcaef116ac2a124be870036e388163b691ec..ff0758772e48bdee7d7adcc4b6d9f814c36bb470 100644 (file)
@@ -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);
        }