X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca584c16e35d7cafe4abca1f1e891a5caa011d5b..4e49dd9cccef1fce6be2c3c47628fdf7b2b2bf38:/include/xbt/function_types.h

diff --git a/include/xbt/function_types.h b/include/xbt/function_types.h
index a632b5af9c..2f6745624f 100644
--- a/include/xbt/function_types.h
+++ b/include/xbt/function_types.h
@@ -1,10 +1,7 @@
-/* $Id$ */
-
 /* function_type.h - classical types for pointer to function                */
 
-/* Copyright (c) 2004-2006 Martin Quinson.                                  */
-/* Copyright (c) 2004 Arnaud Legrand.                                       */
-/* All rights reserved.                                                     */
+/* 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
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,21 +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* (pvoid_f_void_t)(void);
-   typedef void* (pvoid_f_pvoid_t)(void*);
-//   typedef void (void_f_void_t) (void);
+typedef void (*void_f_pvoid_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_pvoid_pvoid_t) (void*,void*);
-   
-   typedef void (*void_pf_void_t) (void);
-   typedef int  (*int_pf_void_t)   (void);
+typedef int (*int_f_void_t) (void);
+typedef int (*int_f_pvoid_t) (void*);
 
-SG_END_DECL()
+typedef int (*int_f_pvoid_pvoid_t) (void *, void *);
+typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *);
 
-#endif /* XBT_MISC_H */
+typedef int (*xbt_main_func_t) (int argc, char *argv[]);
+
+SG_END_DECL()
+#endif                          /* XBT_FUNCTION_TYPE_H */