diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/spl/php_spl.h | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/spl/php_spl.h')
| -rw-r--r-- | ext/spl/php_spl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index b186255f57..99279becd9 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -60,10 +60,10 @@ PHP_MINFO_FUNCTION(spl); ZEND_BEGIN_MODULE_GLOBALS(spl) zend_string *autoload_extensions; HashTable *autoload_functions; - int autoload_running; intptr_t hash_mask_handle; intptr_t hash_mask_handlers; int hash_mask_init; + int autoload_running; ZEND_END_MODULE_GLOBALS(spl) #ifdef ZTS @@ -79,7 +79,7 @@ PHP_FUNCTION(class_parents); PHP_FUNCTION(class_implements); PHP_FUNCTION(class_uses); -PHPAPI void php_spl_object_hash(zval *obj, char* md5str TSRMLS_DC); +PHPAPI zend_string *php_spl_object_hash(zval *obj TSRMLS_DC); #endif /* PHP_SPL_H */ |