Make smx_file_t, surf_file_t and msg_file_t

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 058341a..7d887b0 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -15,22 +15,19 @@
           __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_CONSTRUCTOR(prio) __attribute__((__constructor__ (prio)))
+# define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__ (prio)))
 # 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__ */