From: Sascha Schumann <sas@php.net>
Date: Fri, 18 Feb 2000 20:04:32 +0000 (+0000)
Subject: Get rid of second declaration of compare_func_t. Either put in a common
X-Git-Tag: php-4.0b4_rc1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7e34cf6ea77c1639ed367c5216fc4f5be0286d7;p=php

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 c8351ccadb..d96bfa09d9 100644
--- 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 3cb8f28d96..dde99a01fb 100644
--- 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);