From: Anatol Belski <ab@php.net>
Date: Wed, 31 Dec 2014 13:47:14 +0000 (+0100)
Subject: cleanup redundand macros
X-Git-Tag: PRE_PHP7_REMOVALS~33^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95e04fed242ac37b950e935a51be7171ec140fb2;p=php

cleanup redundand macros
---

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index d8b194b648..60429cb462 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -44,7 +44,7 @@ ZEND_API zval *zend_list_insert(void *ptr, int type)
 	return zend_hash_index_add_new(&EG(regular_list), index, &zv);
 }
 
-ZEND_API int _zend_list_delete(zend_resource *res)
+ZEND_API int zend_list_delete(zend_resource *res)
 {
 	if (--GC_REFCOUNT(res) <= 0) {
 		return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -53,7 +53,7 @@ ZEND_API int _zend_list_delete(zend_resource *res)
 	}
 }
 
-ZEND_API int _zend_list_free(zend_resource *res)
+ZEND_API int zend_list_free(zend_resource *res)
 {
 	if (GC_REFCOUNT(res) <= 0) {
 		return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -79,7 +79,7 @@ static void zend_resource_dtor(zend_resource *res)
 }
 
 
-ZEND_API int _zend_list_close(zend_resource *res)
+ZEND_API int zend_list_close(zend_resource *res)
 {
 	if (GC_REFCOUNT(res) <= 0) {
 		return zend_list_delete(res);
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index fc63c4cb1d..7da5d58dfa 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -55,13 +55,9 @@ int zend_init_rsrc_list_dtors(void);
 void zend_destroy_rsrc_list_dtors(void);
 
 ZEND_API zval *zend_list_insert(void *ptr, int type);
-ZEND_API int _zend_list_free(zend_resource *res);
-ZEND_API int _zend_list_delete(zend_resource *res);
-ZEND_API int _zend_list_close(zend_resource *res);
-
-#define zend_list_free(res)			_zend_list_free(res)
-#define zend_list_delete(res)		_zend_list_delete(res)
-#define zend_list_close(res)		_zend_list_close(res)
+ZEND_API int zend_list_free(zend_resource *res);
+ZEND_API int zend_list_delete(zend_resource *res);
+ZEND_API int zend_list_close(zend_resource *res);
 
 ZEND_API zend_resource *zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
 ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...);