diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/java/java.c | 2 | ||||
| -rw-r--r-- | ext/rpc/com/COM.c | 2 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 2 | ||||
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | ext/standard/browscap.c | 4 | ||||
| -rw-r--r-- | ext/standard/var.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/ext/java/java.c b/ext/java/java.c index db27c3b553..037e43bdbd 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -497,7 +497,7 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject presult->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); presult->is_ref=1; presult->refcount=1; - zend_hash_init(presult->value.obj.properties, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); }; handle = (pval *) emalloc(sizeof(pval)); diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 5cbcc394ef..d86d5c2770 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -414,7 +414,7 @@ static void php_variant_to_pval(VARIANTARG *var_arg, pval *pval_arg, int persist pval_arg->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); pval_arg->is_ref=1; pval_arg->refcount=1; - zend_hash_init(pval_arg->value.obj.properties, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); handle = (pval *) emalloc(sizeof(pval)); handle->type = IS_LONG; diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index db27c3b553..037e43bdbd 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -497,7 +497,7 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject presult->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); presult->is_ref=1; presult->refcount=1; - zend_hash_init(presult->value.obj.properties, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); }; handle = (pval *) emalloc(sizeof(pval)); diff --git a/ext/standard/array.c b/ext/standard/array.c index e18d122b4b..a7c7a908e8 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1205,7 +1205,7 @@ HashTable* _phpi_splice(HashTable *in_hash, int offset, int length, /* Create and initialize output hash */ out_hash = (HashTable *)emalloc(sizeof(HashTable)); - zend_hash_init(out_hash, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(out_hash, 0, NULL, ZVAL_PTR_DTOR, 0); /* Start at the beginning of the input hash and copy entries to output hash until offset is reached */ diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 71df53e841..a6a0a7b857 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -104,13 +104,13 @@ PHP_FUNCTION(get_browser) *return_value = **agent; return_value->type = IS_OBJECT; pval_copy_constructor(return_value); - return_value->value.ht->pDestructor = PVAL_DESTRUCTOR; + return_value->value.ht->pDestructor = ZVAL_DESTRUCTOR; while (zend_hash_find((*agent)->value.ht, "parent",sizeof("parent"), (void **) &agent_name)==SUCCESS) { if (zend_hash_find(&browser_hash,(*agent_name)->value.str.val, (*agent_name)->value.str.len+1, (void **)&agent)==FAILURE) { break; } - zend_hash_merge(return_value->value.ht,(*agent)->value.ht, PVAL_COPY_CTOR, (void *) &tmp, sizeof(pval), 0); + zend_hash_merge(return_value->value.ht,(*agent)->value.ht, ZVAL_COPY_CTOR, (void *) &tmp, sizeof(pval), 0); } } diff --git a/ext/standard/var.c b/ext/standard/var.c index 0b160c700e..736971a724 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -421,7 +421,7 @@ int php_var_unserialize(pval **rval, const char **p, const char *max) i = atoi(*p); if (cur == 'a') { /* object_init_ex will init the HashTable for objects! */ - zend_hash_init(myht, i + 1, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(myht, i + 1, NULL, ZVAL_PTR_DTOR, 0); } while (**p && **p != ':') { |