diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-09-18 04:02:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-09-18 04:02:43 +0400 |
| commit | e646c6d5b508fcdaa844b6df5ef35a6b79a5c84b (patch) | |
| tree | e8c2f242283ab8834ba87bc6f458f56e7db0b8f3 | |
| parent | 341ff0dea5065176fbcb53505c2a5c845a252c8c (diff) | |
| download | php-git-e646c6d5b508fcdaa844b6df5ef35a6b79a5c84b.tar.gz | |
Fixed compilation warnings
| -rw-r--r-- | Zend/zend_arena.h | 1 | ||||
| -rw-r--r-- | Zend/zend_execute.h | 2 | ||||
| -rw-r--r-- | Zend/zend_variables.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h index 8988eb4ab5..96e18a6910 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 614cb07b4f..334a4ccc03 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 538d2a5566..94ae438e9d 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); } } |