# define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
# define _XBT_GNUC_UNUSED __attribute__((unused))
-#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
-#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_FUNC__ __func__ /* ISO-C99 compliant */
#else
# define _XBT_FUNCTION "function"
#endif
# define XBT_INLINE inline
#endif
+/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
+#ifdef MIN
+# undef MIN
+#endif
+#define MIN(a,b) ((a)<(b)?(a):(b))
+
+#ifdef MAX
+# undef MAX
+#endif
+#define MAX(a,b) ((a)>(b)?(a):(b))
+
+
/*
* Function calling convention (not used for now)
*/
-
+
#ifdef _WIN32
# ifndef _XBT_CALL
# define _XBT_CALL __cdecl
# endif
-#else
+#else
# define _XBT_CALL
#endif
+/* Support for SuperNovae compilation mode, where we stuff every source file
+ * into the same compilation unit to help GCC inlining what should be.
+ * To go further on this, the internal getters/setters are then marked
+ * "static inline", while they are regular symbols otherwise.
+ */
+#ifdef SUPERNOVAE_MODE
+# define SUPERNOVAE_INLINE static inline
+#else
+# define SUPERNOVAE_INLINE
+#endif
+
/* Handle import/export stuff
*
* Rational of XBT_PUBLIC:
#if defined(DLL_EXPORT)
# 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_DECLARE_DATA __declspec(dllexport)
+# define XBT_IMPORT_NO_EXPORT(type) type
+# define XBT_PUBLIC_DATA(type) __declspec(dllexport) type
/* Pack everything up statically */
#elif defined(DLL_STATIC)
-# define XBT_PUBLIC(type) type
+# define XBT_PUBLIC(type) extern type
# define XBT_EXPORT_NO_IMPORT(type) type
# define XBT_IMPORT_NO_EXPORT(type) type
-# define XBT_DECLARE_DATA
+# define XBT_PUBLIC_DATA(type) extern type
+
/* Link against the DLL */
-#elif (defined(_WIN32) && !defined(DLL_EXPORT))
-# define XBT_PUBLIC(type) __declspec(dllimport) type
+#elif (defined(_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
+
+/* UNIX build. If compiling in supernovae, try to inline everything */
+#elif defined(SUPERNOVAE_MODE)
+# define XBT_PUBLIC(type) inline type
# define XBT_EXPORT_NO_IMPORT(type) type
-# define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type
-# define XBT_DECLARE_DATA __declspec(dllimport)
-
-/* Non-UNIX build. Let's keep sain here ;) */
+# define XBT_IMPORT_NO_EXPORT(type) type
+# define XBT_PUBLIC_DATA(type) extern type
+/* UNIX sain build... */
#else
# define XBT_PUBLIC(type) extern type
# define XBT_EXPORT_NO_IMPORT(type) type
# define XBT_IMPORT_NO_EXPORT(type) type
-# define XBT_DECLARE_DATA
+# define XBT_PUBLIC_DATA(type) extern type
#endif
-
-
-
-#ifndef max
+#if !defined (max) && !defined(__cplusplus)
# define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
-#ifndef min
+#if !defined (min) && !defined(__cplusplus)
# define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#define TRUE 1
#define FALSE 0
-#define XBT_MAX_CHANNEL 10 /* FIXME: killme */
+#define XBT_MAX_CHANNEL 10 /* FIXME: killme */
/*! C++ users need love */
#ifndef SG_BEGIN_DECL
# ifdef __cplusplus
# define SG_BEGIN_DECL() extern "C" {
# else
-# define SG_BEGIN_DECL()
+# define SG_BEGIN_DECL()
# endif
#endif
-/*! C++ users need love */
#ifndef SG_END_DECL
# ifdef __cplusplus
# define SG_END_DECL() }
# else
-# define SG_END_DECL()
+# define SG_END_DECL()
# endif
#endif
/* End of cruft for C++ */
SG_BEGIN_DECL()
-XBT_PUBLIC(const char *)xbt_procname(void);
+XBT_PUBLIC(const char *) xbt_procname(void);
-#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
-
-SG_END_DECL()
+#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
+SG_END_DECL()
#endif /* XBT_MISC_H */
-
-
-
-
