diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-05 15:11:24 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-05 15:11:24 +0000 |
| commit | 9f51f154aa5e40baabd3b605675edef5772778a8 (patch) | |
| tree | 913caedad44228494f4fd13c7ea9b337d499660f /Zend/zend_API.c | |
| parent | 5ac1ee403bed25e0a0b6c515991692df07c41ddb (diff) | |
| download | php-git-9f51f154aa5e40baabd3b605675edef5772778a8.tar.gz | |
- Stop passing list/plist to internal functions
- Add a typedef for the pCopyConstructor function pointer
- Minor hacks
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 60e13ea920..4cf4eb6e22 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -210,7 +210,7 @@ ZEND_API inline int object_init_ex(zval *arg, zend_class_entry *class_type) ALLOC_HASHTABLE(arg->value.obj.properties); zend_hash_init(arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(arg->value.obj.properties, &class_type->default_properties, (void (*)(void *)) zval_add_ref, (void *) &tmp, sizeof(zval *)); + zend_hash_copy(arg->value.obj.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); arg->type = IS_OBJECT; arg->value.obj.ce = class_type; return SUCCESS; @@ -695,7 +695,9 @@ ZEND_API int zend_startup_module(zend_module_entry *module) if (module) { module->module_number = zend_next_free_module(); if (module->module_startup_func) { - if (module->module_startup_func(MODULE_PERSISTENT, module->module_number)==FAILURE) { + ELS_FETCH(); + + if (module->module_startup_func(MODULE_PERSISTENT, module->module_number ELS_CC)==FAILURE) { zend_error(E_CORE_ERROR,"Unable to start %s module",module->name); return FAILURE; } @@ -842,10 +844,12 @@ void module_destructor(zend_module_entry *module) int module_registry_request_startup(zend_module_entry *module) { if (module->request_startup_func) { + ELS_FETCH(); + #if 0 zend_printf("%s: Request startup\n",module->name); #endif - if (module->request_startup_func(module->type, module->module_number)==FAILURE) { + if (module->request_startup_func(module->type, module->module_number ELS_CC)==FAILURE) { zend_error(E_WARNING, "request_startup() for %s module failed", module->name); exit(1); } |