Cannot use a variable defined on command line here.

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index cefbc2f..2c57127 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -15,22 +15,25 @@
           __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__))
+/* 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__ */
 # 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__ */
@@ -78,6 +81,30 @@
 #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) 
@@ -172,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