s/_XBT_GNUC_FUNCTION/_XBT_FUNCTION/ (that's how to get __FUNCTION__ portably)

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index b38b9de..0a97552 100644 (file)
--- 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
@@ -49,6 +82,8 @@ typedef struct {
    int port;
 } xbt_host_t;
 
+const char *xbt_procname(void);
+
 END_DECL()
 
 #endif /* XBT_MISC_H */