Fixed compilation warnings

diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h
index 8988eb4ab5c4ea932fe7b09c44cbd8236c33a61f..96e18a6910da478d68a3c23f7bf850fdf4cf688c 100644 (file)
--- 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 614cb07b4f9b80e4bee84e47f43a0760d1a82014..334a4ccc0385dc39d3a7f1cfb96adc4d916ee3f0 100644 (file)
--- 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 538d2a5566eb06abc8105198a22f7ba1e384f1f4..94ae438e9d20eae48b5a374b6198a40af461e2b6 100644 (file)
--- 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);
        }
 }