Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.

This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.

3 files changed, 3 insertions, 3 deletions

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 6e7d7519c7..5dff89e37f 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -209,7 +209,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
 					ALLOC_HASHTABLE(intern->node_list);
 					zend_hash_init(intern->node_list, 0, NULL, ZVAL_PTR_DTOR, 0);
 				}
-				GC_REFCOUNT(&retval)++;
+				Z_ADDREF(retval);
 				zend_hash_next_index_insert(intern->node_list, &retval);
 				obj = Z_DOMOBJ_P(&retval);
 				nodep = dom_object_get_node(obj);
diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp
index e76f3b830f..0531a6b933 100644
--- a/ext/intl/common/common_enum.cpp
+++ b/ext/intl/common/common_enum.cpp
@@ -183,7 +183,7 @@ static zend_object_iterator *IntlIterator_get_iterator(
 		return NULL;
 	}
 
-	++GC_REFCOUNT(ii->iterator);
+	++GC_REFCOUNT(&ii->iterator->std);
 
 	return ii->iterator;
 }
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 463cbd6a3a..00731c70c3 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2314,7 +2314,7 @@ ZEND_METHOD(reflection_generator, getExecutingGenerator)
 	REFLECTION_CHECK_VALID_GENERATOR(ex)
 
 	current = zend_generator_get_current(generator);
-	++GC_REFCOUNT(current);
+	++GC_REFCOUNT(&current->std);
 
 	ZVAL_OBJ(return_value, (zend_object *) current);
 }