From 2ea5ad4f724dff9bcb6f4c4f73783d2dae1c0211 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 24 Oct 2005 22:20:25 +0000 Subject: [PATCH] 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 --- include/surf/surf_parse.h | 2 +- include/xbt/misc.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/surf/surf_parse.h b/include/surf/surf_parse.h index 65eaa85c08..423f0e3fbc 100644 --- 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 a4fa1b52f9..8c2709aab6 100644 --- 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 */ -- 2.20.1