diff options
| author | Sara Golemon <pollita@php.net> | 2017-09-07 16:26:45 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-09-07 16:26:45 -0400 |
| commit | 9369843ee2b528eed45aa0a85ebda3a45fd8b60f (patch) | |
| tree | e3e85c1790dcd0ee99ffca88bf0b60182cbca939 | |
| parent | 0f88a49fd511e6c68d004cc4aecd7aae76dbd63f (diff) | |
| parent | f18cf46d07ebbb212aa1283a19ed531919136c54 (diff) | |
| download | php-git-9369843ee2b528eed45aa0a85ebda3a45fd8b60f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix typo in zend_symtable_add_new() API name
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 | ||||
| -rw-r--r-- | Zend/zend_hash.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 4ec48a4c42..1c656a7ad0 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1280,7 +1280,7 @@ ZEND_FUNCTION(get_object_vars) zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len); zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value); } else { - zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value); + zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value); } } } diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 1b998085e9..d83e2fbe1f 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -337,7 +337,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF); } -static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData) +static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData) { zend_ulong idx; |