Put all typedef of generic callbacks in the same place

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

diff --git a/include/surf/surf_parse.h b/include/surf/surf_parse.h
index 65eaa85..423f0e3 100644 (file)
--- a/include/surf/surf_parse.h
+++ b/include/surf/surf_parse.h
@@ -9,8 +9,8 @@
 #define _SURF_SURF_PARSE_H
 
 #include "surf/surfxml.h"
+#include "xbt/misc.h"
 
-typedef   int (*int_f_void_t)(void);
 extern int_f_void_t surf_parse;
 
 #endif

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index a4fa1b5..8c2709a 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -84,11 +84,16 @@ typedef struct {
 
 const char *xbt_procname(void);
 
-   /** \brief Pointer to a function freeing a pointed data */
+
+/* Generic function type */
+
    typedef void (void_f_ppvoid_t)(void**);
-   /** \brief Pointer to a function freeing some data */
-   typedef   void (void_f_pvoid_t) (void*);
+   typedef void (void_f_pvoid_t) (void*);
 
+   typedef int  (int_f_pvoid_pvoid_t) (void*,void*);
+   
+   typedef int  (*int_f_void_t)   (void); /* FIXME: rename it to int_pf_void_t */
+   
 SG_END_DECL()
 
 #endif /* XBT_MISC_H */