1 files changed, 7 insertions, 12 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index cf878ef430..cd6b6073a9 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -220,20 +220,15 @@ int zend_init_rsrc_plist(void)
 }
 
 
-static int zend_close_rsrc(zval *zv)
-{
-	zend_resource *res = Z_PTR_P(zv);
-
-	if (res->type >= 0) {
-		zend_resource_dtor(res);
-	}
-	return ZEND_HASH_APPLY_KEEP;
-}
-
-
 void zend_close_rsrc_list(HashTable *ht)
 {
-	zend_hash_reverse_apply(ht, zend_close_rsrc);
+	zend_resource *res;
+
+	ZEND_HASH_REVERSE_FOREACH_PTR(ht, res) {
+		if (res->type >= 0) {
+			zend_resource_dtor(res);
+		}
+	} ZEND_HASH_FOREACH_END();
 }