- typedef int (int_f_pvoid_pvoid_t) (void*,void*);
-
- typedef int (*int_f_void_t) (void); /* FIXME: rename it to int_pf_void_t */
+typedef int (*int_f_int_pvoid_t)(int, void*);
+typedef int (*int_f_pvoid_pvoid_t) (void *, void *);
+typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *);