diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-05-05 10:34:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-05-05 10:34:04 +0800 |
| commit | cf15e94e0797bbafe89efec5176a248839250909 (patch) | |
| tree | f414e70269e062a67fa9b7b9b08cab43a470b290 /Zend/zend_hash.c | |
| parent | 41f68894366e1156191387034fc53286d9fec747 (diff) | |
| parent | b30c7fe2639aba8453a4808a285fc2acea36d7bd (diff) | |
| download | php-git-cf15e94e0797bbafe89efec5176a248839250909.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
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 bc882dd8db..3ffdf6ef76 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -66,12 +66,12 @@ static void _zend_is_inconsistent(const HashTable *ht, const char *file, int lin if ((ht)->u.flags >= (3 << 8)) { \ zend_error_noreturn(E_ERROR, "Nesting level too deep - recursive dependency?");\ } \ - (ht)->u.flags += (1 << 8); \ + ZEND_HASH_INC_APPLY_COUNT(ht); \ } #define HASH_UNPROTECT_RECURSION(ht) \ if ((ht)->u.flags & HASH_FLAG_APPLY_PROTECTION) { \ - (ht)->u.flags -= (1 << 8); \ + ZEND_HASH_DEC_APPLY_COUNT(ht); \ } #define ZEND_HASH_IF_FULL_DO_RESIZE(ht) \ |