glitch fix in host.h, and remove host_t cruft from misc.h

[simgrid.git] / include / xbt / misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index a4fa1b5..4c01db9 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -21,12 +21,14 @@
 # define _XBT_GNUC_FORMAT( arg_idx )                \
                   __attribute__((__format_arg__ (arg_idx)))
 # define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
+# define _XBT_GNUC_UNUSED  __attribute__((unused))
 
 #else   /* !__GNUC__ */
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )
 # define _XBT_GNUC_SCANF( format_idx, arg_idx )
 # define _XBT_GNUC_FORMAT( arg_idx )
 # define _XBT_GNUC_NORETURN
+# define _XBT_GNUC_UNUSED
 
 #endif  /* !__GNUC__ */
 
@@ -76,19 +78,22 @@
 /* End of cruft for C++ */
 
 SG_BEGIN_DECL()
-/* Dunno where to place this: needed by config and amok */
-typedef struct {  
-   char *name;
-   int port;
-} xbt_host_t;
 
 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 void (*void_f_void_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 */
 
+#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
+   
 SG_END_DECL()
 
 #endif /* XBT_MISC_H */