Rhhaaa, use the __compar_fn_t type defined in stdlib instead of

int_f_pvoid_pvoid

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7844 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 6fb99a8..0b881bc 100644 (file)
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -10,6 +10,8 @@
 #define _XBT_DYNAR_H
 
 #include <string.h> /* memcpy */
+#include <stdlib.h> /* __compar_fn_t */
+
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/function_types.h"
 
@@ -97,7 +99,7 @@ XBT_PUBLIC(void) xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx,
 
 XBT_PUBLIC(int) xbt_dynar_search(xbt_dynar_t const dynar, void *elem);
 XBT_PUBLIC(int) xbt_dynar_member(xbt_dynar_t const dynar, void *elem);
-XBT_PUBLIC(void) xbt_dynar_sort(xbt_dynar_t const dynar, int_f_pvoid_pvoid_t compar_fn);
+XBT_PUBLIC(void) xbt_dynar_sort(xbt_dynar_t const dynar, __compar_fn_t);
 
 /** @} */
 /** @defgroup XBT_dynar_perl Perl-like use of dynars

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 5498ba1..446f26d 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -692,7 +692,7 @@ XBT_INLINE void xbt_dynar_cursor_unlock(xbt_dynar_t dynar)
  * Remark: if the elements stored in the dynar are structures, the compar_fn
  * function has to retrieve the field to sort first.
  */
-XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, int_f_pvoid_pvoid_t compar_fn){
+XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, __compar_fn_t compar_fn){
 
        _dynar_lock(dynar);