diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-08-13 13:56:29 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-08-13 13:56:29 +0300 |
| commit | 715d5d2855a0c6946ac99f1631a4dd9168b0cbfe (patch) | |
| tree | cf5bf02178ec1946335c301c65a302311a4053ef /Zend/zend_execute_API.c | |
| parent | e5813fedf8c0b7309958d7ed471945d2dbf14998 (diff) | |
| download | php-git-715d5d2855a0c6946ac99f1631a4dd9168b0cbfe.tar.gz | |
Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 983bc5c1e3..7b9dbce3ca 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -843,8 +843,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / EG(scope) = func->common.scope; call->symbol_table = fci->symbol_table; if (UNEXPECTED(func->op_array.fn_flags & ZEND_ACC_CLOSURE)) { - ZEND_ASSERT(GC_TYPE(func->op_array.prototype) == IS_OBJECT); - GC_REFCOUNT(func->op_array.prototype)++; + ZEND_ASSERT(GC_TYPE((zend_object*)func->op_array.prototype) == IS_OBJECT); + GC_REFCOUNT((zend_object*)func->op_array.prototype)++; ZEND_ADD_CALL_FLAG(call, ZEND_CALL_CLOSURE); } if (EXPECTED((func->op_array.fn_flags & ZEND_ACC_GENERATOR) == 0)) { |