- Add typedef for function pointer of llist dtor

diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 6cdaf236fc427548d79e73d8528b4339ccdd6c1b..a85492c3964102a2d5de5fc53c81f551d10cc019 100644 (file)
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -21,7 +21,7 @@
 #include "zend.h"
 #include "zend_llist.h"
 
-ZEND_API void zend_llist_init(zend_llist *l, size_t size, void (*dtor)(void *data), unsigned char persistent)
+ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
 {
        l->head = NULL;
        l->tail = NULL;

diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 1fc888d95f65e192e8ea6b93865fe5aacf25d503..420c214e1a31a9eac847930dd7646f688f9ad03c 100644 (file)
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -29,24 +29,25 @@ typedef struct _zend_llist_element {
        char data[1]; /* Needs to always be last in the struct */
 } zend_llist_element;
 
+typedef void (*llist_dtor_func_t)(void *);
+typedef int (*llist_compare_func_t)(const zend_llist_element *, const zend_llist_element *);
+typedef void (*llist_apply_with_arg_func_t)(void *data, void *arg);
+typedef void (*llist_apply_with_args_func_t)(void *data, int num_args, va_list args);
+typedef void (*llist_apply_func_t)(void *);
+
 typedef struct _zend_llist {
        zend_llist_element *head;
        zend_llist_element *tail;
        size_t size;
-       void (*dtor)(void *data);
+       llist_dtor_func_t dtor;
        unsigned char persistent;
        zend_llist_element *traverse_ptr;
 } zend_llist;
 
-typedef int (*llist_compare_func_t)(const zend_llist_element *, const zend_llist_element *);
-typedef void(*llist_apply_with_arg_func_t)(void *data, void *arg);
-typedef void(*llist_apply_with_args_func_t)(void *data, int num_args, va_list args);
-typedef void (*llist_apply_func_t)(void *);
-
 typedef zend_llist_element* zend_llist_position;
 
 BEGIN_EXTERN_C()
-ZEND_API void zend_llist_init(zend_llist *l, size_t size, void (*dtor)(void *data), unsigned char persistent);
+ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent);
 ZEND_API void zend_llist_add_element(zend_llist *l, void *element);
 ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element);
 ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2));