/* inline and __FUNCTION__ are only in GCC when -ansi is off */
#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
-
-# define _XBT_GNUC_FUNCTION __FUNCTION__
+# define _XBT_FUNCTION __FUNCTION__
+# define _XBT_INLINE inline
+#elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+# define _XBT_FUNC__ __func__ /* ISO-C99 compliant */
# define _XBT_INLINE inline
#else
-# define _XBT_GNUC_FUNCTION "function"
+# define _XBT_FUNCTION "function"
# define _XBT_INLINE
#endif
#define XBT_MAX_CHANNEL 10 /* FIXME: killme */
/*! C++ users need love */
-#ifndef BEGIN_DECL
+#ifndef SG_BEGIN_DECL
# ifdef __cplusplus
-# define BEGIN_DECL() extern "C" {
+# define SG_BEGIN_DECL() extern "C" {
# else
-# define BEGIN_DECL()
+# define SG_BEGIN_DECL()
# endif
#endif
/*! C++ users need love */
-#ifndef END_DECL
+#ifndef SG_END_DECL
# ifdef __cplusplus
-# define END_DECL() }
+# define SG_END_DECL() }
# else
-# define END_DECL()
+# define SG_END_DECL()
# endif
#endif
/* End of cruft for C++ */
-BEGIN_DECL()
+SG_BEGIN_DECL()
/* Dunno where to place this: needed by config and amok */
typedef struct {
char *name;
int port;
} xbt_host_t;
-END_DECL()
+const char *xbt_procname(void);
+
+
+/* Generic function type */
+
+ typedef void (void_f_ppvoid_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 */
+
+#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
+
+SG_END_DECL()
#endif /* XBT_MISC_H */