diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-10-29 23:17:18 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-10-29 23:17:18 +0000 |
| commit | 41abc6d01742f97ca1fd43cc1130634f80458f8d (patch) | |
| tree | c589909f43058ea12e8cd0ed0f2b70baf600549f /ext/spl/php_spl.h | |
| parent | 62270fef736ad8338d66be4d32dcbcf75b5e5995 (diff) | |
| download | php-git-41abc6d01742f97ca1fd43cc1130634f80458f8d.tar.gz | |
- Reverted changes that required constructor overrides to invoke the parent
constructor in several SPL classes and applied 5.3 fixes instead.
Related bugs: #54384, #55175 and #55300
Diffstat (limited to 'ext/spl/php_spl.h')
| -rwxr-xr-x | ext/spl/php_spl.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 7c6e174e97..500f7ef287 100755 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -63,15 +63,13 @@ PHP_MINFO_FUNCTION(spl); ZEND_BEGIN_MODULE_GLOBALS(spl) - char * autoload_extensions; - HashTable * autoload_functions; - int autoload_running; - int autoload_extensions_len; - intptr_t hash_mask_handle; - intptr_t hash_mask_handlers; - int hash_mask_init; - zend_function constr_wrapper_fun; - int (*validating_fun)(void *object_data TSRMLS_DC); + char * autoload_extensions; + HashTable * autoload_functions; + int autoload_running; + int autoload_extensions_len; + intptr_t hash_mask_handle; + intptr_t hash_mask_handlers; + int hash_mask_init; ZEND_END_MODULE_GLOBALS(spl) #ifdef ZTS @@ -89,8 +87,6 @@ PHP_FUNCTION(class_uses); PHPAPI void php_spl_object_hash(zval *obj, char* md5str TSRMLS_DC); -zend_function *php_spl_get_constructor_helper(zval *object, int (*validating_fun)(void *object_data TSRMLS_DC) TSRMLS_DC); - #endif /* PHP_SPL_H */ /* |