Get rid of second declaration of compare_func_t. Either put in a common

header file or prefix it with i.e. zend_llist_

diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index c8351ccadb5ff33d8b368c99cf7cbf3d867d1f24..d96bfa09d9d038b73a721b2ac44c7b4178a23cd2 100644 (file)
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -171,7 +171,7 @@ ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func)
                *ptr++ = element;
        }
 
-       qsort(elements, list_size, sizeof(zend_llist_element *), (compare_func_t) comp_func);
+       qsort(elements, list_size, sizeof(zend_llist_element *), (int (*)(const void *, const void *)) comp_func);
 
        l->head = elements[0];
        elements[0]->prev = NULL;

diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 3cb8f28d965d844b9e3cba4698f4b1fd72965a6f..dde99a01fbc7438ac7e4d9f579b6b8f6fda650b0 100644 (file)
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -39,7 +39,6 @@ typedef struct _zend_llist {
 } zend_llist;
 
 typedef int (*llist_compare_func_t) (const zend_llist_element *, const zend_llist_element *);
-typedef int  (*compare_func_t)(const void *, const void *);
 
 BEGIN_EXTERN_C()
 ZEND_API void zend_llist_init(zend_llist *l, size_t size, void (*dtor)(void *data), unsigned char persistent);