Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 5ee2661..2c57127 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -15,37 +15,43 @@
           __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__))
-# define _XBT_GNUC_UNUSED  __attribute__((unused))
-# define _XBT_GNUC_CONSTRUCTOR __attribute__((__constructor__))
-# define _XBT_GNUC_DESTRUCTOR __attribute__((__destructor__))
+# define _XBT_GNUC_UNUSED  __attribute__((__unused__))
+/* Apparently, constructor priorities are not supported by gcc on Macs */
+# if __APPLE__
+#  define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__))
+#  define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__))
+# else
+#  define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__ (prio)))
+#  define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__ (prio)))
+# endif
 # undef _XBT_NEED_INIT_PRAGMA
 
-#else /* !__GNUC__ */
+#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
-# define _XBT_GNUC_CONSTRUCTOR
-# define _XBT_GNUC_DESTRUCTOR
+# define _XBT_GNUC_CONSTRUCTOR(prio)
+# define _XBT_GNUC_DESTRUCTOR(prio)
 # define  _XBT_NEED_INIT_PRAGMA 1
 
-#endif /* !__GNUC__ */
+#endif                          /* !__GNUC__ */
 
 /* inline and __FUNCTION__ are only in GCC when -ansi is off */
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define _XBT_FUNC__ __func__   /* ISO-C99 compliant */
+# define _XBT_FUNCTION __func__ /* ISO-C99 compliant */
 #else
 # define _XBT_FUNCTION "function"
 #endif
 
-#ifndef __cplusplus
+#ifdef DOXYGEN
+#  define XBT_INLINE
+#else
+#  ifndef __cplusplus
 #    if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 #        define XBT_INLINE inline
 #    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
@@ -55,8 +61,13 @@
 #    else
 #        define XBT_INLINE
 #    endif
-# else
-#    define XBT_INLINE  inline
+#  else
+#         if defined (__VISUALC__)
+#                 define XBT_INLINE __inline
+#         else
+#       define XBT_INLINE  inline
+#         endif
+#  endif /* __cplusplus */
 #endif
 
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
@@ -70,12 +81,36 @@
 #endif
 #define MAX(a,b) ((a)>(b)?(a):(b))
 
+/*
+ * Expands to `one' if there is only one argument for the variadic part.
+ * Otherwise, expands to `more'.
+ * Works with up to 63 arguments, which is the maximum mandated by the C99
+ * standard.
+ */
+#define _XBT_IF_ONE_ARG(one, more, ...)                                 \
+    _XBT_IF_ONE_ARG_(__VA_ARGS__,                                       \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, more,    \
+                     more, more, more, more, more, more, more, one)
+#define _XBT_IF_ONE_ARG_(a64, a63, a62, a61, a60, a59, a58, a57,        \
+                         a56, a55, a54, a53, a52, a51, a50, a49,        \
+                         a48, a47, a46, a45, a44, a43, a42, a41,        \
+                         a40, a39, a38, a37, a36, a35, a34, a33,        \
+                         a32, a31, a30, a29, a28, a27, a26, a25,        \
+                         a24, a23, a22, a21, a20, a19, a18, a17,        \
+                         a16, a15, a14, a13, a12, a11, a10, a9,         \
+                         a8, a7, a6, a5, a4, a3, a2, a1, N, ...) N
 
 /* 
  * Function calling convention (not used for now) 
  */
 
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 #  ifndef _XBT_CALL
 #    define _XBT_CALL __cdecl
 #   endif
@@ -139,9 +174,8 @@
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern type
 
-
 /* Link against the DLL */
-#elif (defined(_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
+#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
 #  define XBT_PUBLIC(type)             __declspec(dllimport) type
 #  define XBT_EXPORT_NO_IMPORT(type)   type
 #  define XBT_IMPORT_NO_EXPORT(type)   __declspec(dllimport) type
@@ -165,7 +199,6 @@
 #define TRUE  1
 #define FALSE 0
 
-#define XBT_MAX_CHANNEL 10      /* FIXME: killme */
 /*! C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
@@ -191,4 +224,4 @@ XBT_PUBLIC(const char *) xbt_procname(void);
 #define XBT_BACKTRACE_SIZE 10   /* FIXME: better place? Do document */
 
 SG_END_DECL()
-#endif /* XBT_MISC_H */
+#endif                          /* XBT_MISC_H */