X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/707e365f2ebe9132b004da4995f4a705df9e5582..2ea5ad4f724dff9bcb6f4c4f73783d2dae1c0211:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index b38b9de568..8c2709aab6 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -12,6 +12,39 @@
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
+/* Attributes are only in recent versions of GCC */
+#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+# define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
+	   __attribute__((__format__ (__printf__, format_idx, arg_idx)))
+# define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
+	       __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
+# define _XBT_GNUC_FORMAT( arg_idx )                \
+		   __attribute__((__format_arg__ (arg_idx)))
+# define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
+
+#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
+
+#endif  /* !__GNUC__ */
+
+/* inline and __FUNCTION__ are only in GCC when -ansi is off */
+
+#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
+# 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_FUNCTION "function"
+# define _XBT_INLINE 
+#endif
+
+
+
 #ifndef max
 #  define max(a, b) (((a) > (b))?(a):(b))
 #endif
@@ -24,31 +57,43 @@
 
 #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 */
+   
+SG_END_DECL()
 
 #endif /* XBT_MISC_H */