X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2031aa043dfead666620ca5c49c36ab3c4eccfb3..a3996e17ef48f52770490734e92ba9bd4109ef83:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 9ef7324061..5260bce95e 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -12,13 +12,20 @@
 /* Attributes are only in recent versions of GCC */
 #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
-	   __attribute__((__format__ (__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)))
+         __attribute__((__format__ (__scanf__, format_idx, 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__))
+/* Constructor priorities exist since gcc 4.3.  Apparently, they are however not
+ * supported on Macs. */
+# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && !defined(__APPLE__)
+#  define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__ (prio)))
+#  define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__ (prio)))
+# else
+#  define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__))
+#  define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__))
+# endif
 # undef _XBT_NEED_INIT_PRAGMA
 
 #else                           /* !__GNUC__ */
@@ -26,8 +33,8 @@
 # define _XBT_GNUC_SCANF( format_idx, 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__ */
@@ -56,11 +63,11 @@
 #        define XBT_INLINE
 #    endif
 #  else
-#	   if defined (__VISUALC__)
-#		   define XBT_INLINE __inline
-#	   else
-#    	 define XBT_INLINE  inline
-#	   endif
+#     if defined (__VISUALC__)
+#       define XBT_INLINE __inline
+#     else
+#       define XBT_INLINE  inline
+#     endif
 #  endif /* __cplusplus */
 #endif
 
@@ -159,7 +166,7 @@
 #  define XBT_PUBLIC(type)            __declspec(dllexport) type
 #  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA(type)	      __declspec(dllexport) type
+#  define XBT_PUBLIC_DATA(type)        __declspec(dllexport) type
 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)
@@ -170,10 +177,10 @@
 
 /* Link against the DLL */
 #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
-#  define XBT_PUBLIC_DATA(type)		__declspec(dllimport) type
+#  define XBT_PUBLIC(type)              __declspec(dllimport) type
+#  define XBT_EXPORT_NO_IMPORT(type)    type
+#  define XBT_IMPORT_NO_EXPORT(type)    __declspec(dllimport) type
+#  define XBT_PUBLIC_DATA(type)    __declspec(dllimport) type
 
 /* UNIX build */
 #else
@@ -184,16 +191,15 @@
 #endif
 
 #if !defined (max) && !defined(__cplusplus)
-#  define max(a,b)	(((a) > (b)) ? (a) : (b))
+#  define max(a,b)  (((a) > (b)) ? (a) : (b))
 #endif
 #if !defined (min) && !defined(__cplusplus)
-#  define min(a,b)	(((a) < (b)) ? (a) : (b))
+#  define min(a,b)  (((a) < (b)) ? (a) : (b))
 #endif
 
 #define TRUE  1
 #define FALSE 0
 
-#define XBT_MAX_CHANNEL 10      /* FIXME: killme */
 /*! C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
@@ -218,16 +224,5 @@ XBT_PUBLIC(const char *) xbt_procname(void);
 
 #define XBT_BACKTRACE_SIZE 10   /* FIXME: better place? Do document */
 
-/** @brief File datatype
-    @ingroup m_datatypes_management_details */
-typedef struct m_file {
-  char *name;                   /**< @brief file name */
-  void *content;                   /**< @brief user data */
-} s_m_file_t;
-/** @brief File datatype
-    @ingroup m_datatypes_management_details */
-typedef struct m_file *m_file_t;
-
-
 SG_END_DECL()
 #endif                          /* XBT_MISC_H */