com php-src: Fixed compilation warnings: Zend/zend_arena.h Zend/zend_execute.h Zend/zend_variables.h

From: Date: Thu, 18 Sep 2014 00:02:43 +0000
Subject: com php-src: Fixed compilation warnings: Zend/zend_arena.h Zend/zend_execute.h Zend/zend_variables.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81720@lists.php.net to get a copy of this message
Commit: e646c6d5b508fcdaa844b6df5ef35a6b79a5c84b Author: Dmitry Stogov <dmitry@zend.com> Thu, 18 Sep 2014 04:02:43 +0400 Parents: 341ff0dea5065176fbcb53505c2a5c845a252c8c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e646c6d5b508fcdaa844b6df5ef35a6b79a5c84b Log: Fixed compilation warnings Changed paths: M Zend/zend_arena.h M Zend/zend_execute.h M Zend/zend_variables.h Diff: diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h index 8988eb4..96e18a6 100644 --- a/Zend/zend_arena.h +++ b/Zend/zend_arena.h @@ -85,6 +85,7 @@ static zend_always_inline void* zend_arena_calloc(zend_arena **arena_ptr, size_t size_t size; void *ret; + (void)d; ZEND_SIGNED_MULTIPLY_LONG(unit_size, count, size, d, overflow); ZEND_ASSERT(overflow == 0); ret = zend_arena_alloc(arena_ptr, size); diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 614cb07..334a4cc 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -56,7 +56,7 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC if (Z_REFCOUNTED_P(zval_ptr)) { if (!Z_DELREF_P(zval_ptr)) { ZEND_ASSERT(zval_ptr != &EG(uninitialized_zval)); - _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC); + _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC); } else { GC_ZVAL_CHECK_POSSIBLE_ROOT(zval_ptr); } diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 538d2a5..94ae438 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -39,7 +39,7 @@ static zend_always_inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) static zend_always_inline void _zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LINE_DC) { if (Z_REFCOUNTED_P(zval_ptr) && !Z_DELREF_P(zval_ptr)) { - _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC); + _zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC); } }

« previous php.cvs (#81720) next »