diff options
Diffstat (limited to 'ext/opcache/zend_accelerator_util_funcs.c')
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 1e9b5e9868..5901b83820 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -180,15 +180,15 @@ static void zend_hash_clone_constants(HashTable *ht, HashTable *source) ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; ht->pDestructor = ZVAL_PTR_DTOR; - ht->u.flags = (source->u.flags & HASH_FLAG_INITIALIZED); + HT_FLAGS(ht) = (HT_FLAGS(source) & HASH_FLAG_INITIALIZED); ht->nInternalPointer = source->nNumOfElements ? 0 : HT_INVALID_IDX; - if (!(ht->u.flags & HASH_FLAG_INITIALIZED)) { + if (!(HT_FLAGS(ht) & HASH_FLAG_INITIALIZED)) { ht->arData = source->arData; return; } - ZEND_ASSERT((source->u.flags & HASH_FLAG_PACKED) == 0); + ZEND_ASSERT((HT_FLAGS(source) & HASH_FLAG_PACKED) == 0); HT_SET_DATA_ADDR(ht, emalloc(HT_SIZE(ht))); HT_HASH_RESET(ht); @@ -231,15 +231,15 @@ static void zend_hash_clone_methods(HashTable *ht, HashTable *source, zend_class ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; ht->pDestructor = ZEND_FUNCTION_DTOR; - ht->u.flags = (source->u.flags & HASH_FLAG_INITIALIZED); + HT_FLAGS(ht) = (HT_FLAGS(source) & HASH_FLAG_INITIALIZED); ht->nInternalPointer = source->nNumOfElements ? 0 : HT_INVALID_IDX; - if (!(ht->u.flags & HASH_FLAG_INITIALIZED)) { + if (!(HT_FLAGS(ht) & HASH_FLAG_INITIALIZED)) { ht->arData = source->arData; return; } - ZEND_ASSERT(!(source->u.flags & HASH_FLAG_PACKED)); + ZEND_ASSERT(!(HT_FLAGS(source) & HASH_FLAG_PACKED)); HT_SET_DATA_ADDR(ht, emalloc(HT_SIZE(ht))); HT_HASH_RESET(ht); @@ -289,15 +289,15 @@ static void zend_hash_clone_prop_info(HashTable *ht, HashTable *source, zend_cla ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; ht->pDestructor = NULL; - ht->u.flags = (source->u.flags & HASH_FLAG_INITIALIZED); + HT_FLAGS(ht) = (HT_FLAGS(source) & HASH_FLAG_INITIALIZED); ht->nInternalPointer = source->nNumOfElements ? 0 : HT_INVALID_IDX; - if (!(ht->u.flags & HASH_FLAG_INITIALIZED)) { + if (!(HT_FLAGS(ht) & HASH_FLAG_INITIALIZED)) { ht->arData = source->arData; return; } - ZEND_ASSERT(!(source->u.flags & HASH_FLAG_PACKED)); + ZEND_ASSERT(!(HT_FLAGS(source) & HASH_FLAG_PACKED)); HT_SET_DATA_ADDR(ht, emalloc(HT_SIZE(ht))); HT_HASH_RESET(ht); |