Z_TYPE_P is for zvals

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 1c0198eeeae0daa788972add521975e243aeb84a..010655a89a11032a468cf1f65292ebf8f0055beb 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1187,7 +1187,7 @@ ZEND_API int zend_register_module_ex(zend_module_entry *module TSRMLS_DC)
 
        if (!module->module_started && module->module_startup_func) {
                EG(current_module) = module;
-               if (module->module_startup_func(Z_TYPE_P(module), module->module_number TSRMLS_CC)==FAILURE) {
+               if (module->module_startup_func(module->type, module->module_number TSRMLS_CC)==FAILURE) {
                        zend_error(E_CORE_ERROR,"Unable to start %s module", module->name);
                        EG(current_module) = NULL;
                        return FAILURE;

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 709370503db429ee7f943034cfbb4a4144fd5352..87c63aa91a90988ca200496376d8c5a9d41f93c1 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -234,7 +234,7 @@ void php_dl(pval *file, int type, pval *return_value TSRMLS_DC)
                        DL_UNLOAD(handle);
                        RETURN_FALSE;
        }
-       Z_TYPE_P(module_entry) = type;
+       module_entry->type = type;
        module_entry->module_number = zend_next_free_module();
        zend_register_module_ex(module_entry TSRMLS_CC);