X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b06da391942d5b2e2d26f50705c764d402382f17..680abdb047c1a66d3ccc14cad518117773c3cc8c:/include/xbt/function_types.h diff --git a/include/xbt/function_types.h b/include/xbt/function_types.h index 201bdb7751..2f6745624f 100644 --- a/include/xbt/function_types.h +++ b/include/xbt/function_types.h @@ -1,6 +1,6 @@ /* function_type.h - classical types for pointer to function */ -/* Copyright (c) 2006, 2007, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2007, 2009-2010, 2012-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,23 +9,22 @@ #ifndef XBT_FUNCTION_TYPE_H #define XBT_FUNCTION_TYPE_H -#include "xbt/misc.h" +#include "xbt/base.h" SG_BEGIN_DECL() -typedef void (*void_f_ppvoid_t) (void **); typedef void (*void_f_pvoid_t) (void *); -typedef void (*void_f_int_pvoid_t) (int,void *); - typedef void *(*pvoid_f_void_t) (void); - typedef void *(*pvoid_f_pvoid_t) (void *); - typedef void (*void_f_void_t) (void); +typedef void *(*pvoid_f_void_t) (void); +typedef void *(*pvoid_f_pvoid_t) (void *); +typedef void (*void_f_void_t) (void); - typedef int (*int_f_void_t) (void); +typedef int (*int_f_void_t) (void); +typedef int (*int_f_pvoid_t) (void*); - typedef int (*int_f_pvoid_pvoid_t) (void *, void *); - typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *); +typedef int (*int_f_pvoid_pvoid_t) (void *, void *); +typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *); - typedef int (*xbt_main_func_t) (int argc, char *argv[]); +typedef int (*xbt_main_func_t) (int argc, char *argv[]); SG_END_DECL() -#endif /* XBT_FUNCTION_TYPE_H */ +#endif /* XBT_FUNCTION_TYPE_H */