diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-21 20:10:31 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 20:10:31 -0700 |
| commit | 02457554a35fbb96fd3f51caf7deab91ca32ecb2 (patch) | |
| tree | 65d97941ac5705d8213949ff7da808d42bf1dc0c /Zend/zend_hash.c | |
| parent | a522f2d1c985a242033eadb41a7bf98efceb7686 (diff) | |
| parent | 97637b2a4c1820916d6bfad510ef63cdeb563022 (diff) | |
| download | php-git-02457554a35fbb96fd3f51caf7deab91ca32ecb2.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
Diffstat (limited to 'Zend/zend_hash.c')
| -rw-r--r-- | Zend/zend_hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index c4cd8421cc..ae7d8402f4 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1144,7 +1144,7 @@ ZEND_API int zend_hash_get_current_key_ex(const HashTable *ht, char **str_index, return HASH_KEY_IS_LONG; } } - return HASH_KEY_NON_EXISTANT; + return HASH_KEY_NON_EXISTENT; } ZEND_API void zend_hash_get_current_key_zval_ex(const HashTable *ht, zval *key, HashPosition *pos) { @@ -1181,7 +1181,7 @@ ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos) return HASH_KEY_IS_LONG; } } - return HASH_KEY_NON_EXISTANT; + return HASH_KEY_NON_EXISTENT; } |