Added macros for managing zval refcounts and is_ref statuses

4 files changed, 12 insertions, 12 deletions

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index 53ce402202..f4ea8a5790 100644
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -38,8 +38,8 @@ static zval *com_property_read(zval *object, zval *member, int type TSRMLS_DC)
 
 	MAKE_STD_ZVAL(return_value);
 	ZVAL_NULL(return_value);
-	return_value->refcount = 0;
-	return_value->is_ref = 0;
+	Z_SET_REFCOUNT_P(return_value, 0);
+	Z_UNSET_ISREF_P(return_value);
 
 	obj = CDNO_FETCH(object);
 
@@ -92,8 +92,8 @@ static zval *com_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
 
 	MAKE_STD_ZVAL(return_value);
 	ZVAL_NULL(return_value);
-	return_value->refcount = 0;
-	return_value->is_ref = 0;
+	Z_SET_REFCOUNT_P(return_value, 0);
+	Z_UNSET_ISREF_P(return_value);
 
 	obj = CDNO_FETCH(object);
 
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index 3513fa0ecd..7bff720be4 100755
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -261,7 +261,7 @@ static void istream_destructor(php_istream *stm)
 		return;
 	}
 
-	if (stm->refcount > 0) {
+	if (Z_REFCOUNT_P(stm) > 0) {
 		CoDisconnectObject((IUnknown*)stm, 0);
 	}
 
@@ -281,7 +281,7 @@ PHPAPI IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
 	memset(stm, 0, sizeof(*stm));
 	stm->engine_thread = GetCurrentThreadId();
 	stm->lpVtbl = &php_istream_vtbl;
-	stm->refcount = 1;
+	Z_SET_REFCOUNT_P(stm, 1);
 	stm->stream = stream;
 
 	zend_list_addref(stream->rsrc_id);
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index 7d8dae994f..04f870c1e7 100644
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -427,7 +427,7 @@ static void saproxy_clone(void *object, void **clone_ptr TSRMLS_DC)
 	cloneproxy = emalloc(sizeof(*cloneproxy));
 	memcpy(cloneproxy, proxy, sizeof(*cloneproxy));
 
-	ZVAL_ADDREF(cloneproxy->zobj);
+	Z_ADDREF_P(cloneproxy->zobj);
 	cloneproxy->indices = safe_emalloc(cloneproxy->dimensions, sizeof(zval *), 0);
 	clone_indices(cloneproxy, proxy, proxy->dimensions);
 
@@ -451,7 +451,7 @@ int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS
 		proxy->zobj = com_object;
 	}
 
-	ZVAL_ADDREF(proxy->zobj);
+	Z_ADDREF_P(proxy->zobj);
 	proxy->indices = safe_emalloc(proxy->dimensions, sizeof(zval *), 0);
 
 	if (rel) {
@@ -570,7 +570,7 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec
 
 	I->proxy = proxy;
 	I->proxy_obj = object;
-	ZVAL_ADDREF(I->proxy_obj);
+	Z_ADDREF_P(I->proxy_obj);
 
 	I->indices = safe_emalloc(proxy->dimensions + 1, sizeof(LONG), 0);
 	for (i = 0; i < proxy->dimensions; i++) {
diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c
index 9690665e93..328938528a 100644
--- a/ext/com_dotnet/com_wrapper.c
+++ b/ext/com_dotnet/com_wrapper.c
@@ -547,11 +547,11 @@ static php_dispatchex *disp_constructor(zval *object TSRMLS_DC)
 
 	disp->engine_thread = GetCurrentThreadId();
 	disp->lpVtbl = &php_dispatch_vtbl;
-	disp->refcount = 1;
+	Z_SET_REFCOUNT_P(disp, 1);
 
 
 	if (object)
-		ZVAL_ADDREF(object);
+		Z_ADDREF_P(object);
 	disp->object = object;
 
 	disp->id = zend_list_insert(disp, le_dispatch);
@@ -572,7 +572,7 @@ static void disp_destructor(php_dispatchex *disp)
 			
 	disp->id = 0;
 	
-	if (disp->refcount > 0)
+	if (Z_REFCOUNT_P(disp) > 0)
 		CoDisconnectObject((IUnknown*)disp, 0);
 
 	zend_hash_destroy(disp->dispid_to_name);