Remove the keyword extern to avoid the multiple declaration of the the variables...

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 51e23cf..cb1ef33 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -56,6 +56,18 @@
 #    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) 
  */
@@ -111,38 +123,40 @@
 
 
 /* Build the DLL */
-#if defined(DLL_EXPORT) 
+#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_PUBLIC_DATA(type)              __declspec(dllexport) type
 
 /* Pack everything up statically */
-#elif defined(DLL_STATIC) 
+#elif defined(DLL_STATIC)
 #  define XBT_PUBLIC(type)            type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
-#  define XBT_IMPORT_NO_EXPORT(type)  type 
+#  define XBT_IMPORT_NO_EXPORT(type)  type
+#  define XBT_PUBLIC_DATA(type)       type
+     
 
 /* Link against the DLL */
-#elif defined(_WIN32) 
-#  define XBT_PUBLIC(type)            __declspec(dllimport) type
-#  define XBT_EXPORT_NO_IMPORT(type)  type
-#  define XBT_IMPORT_NO_EXPORT(type)  __declspec(dllimport) type
+#elif (defined(_WIN32) && !defined(DLL_EXPORT))
+#  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
 
-/* Non-UNIX build. Let's keep sain here ;) */
-#else 
+/* UNIX build. Let's keep sain here ;) */
+#else
 #  define XBT_PUBLIC(type)            extern type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
+#  define XBT_PUBLIC_DATA(type)       type
 #endif
    
-
-
-
-#ifndef max
-#  define max(a, b) (((a) > (b))?(a):(b))
+#if !defined (max) && !defined(__cplusplus)
+#  define max(a,b)     (((a) > (b)) ? (a) : (b))
 #endif
-#ifndef min
-#  define min(a, b) (((a) < (b))?(a):(b))
+#if !defined (min) && !defined(__cplusplus)
+#  define min(a,b)     (((a) < (b)) ? (a) : (b))
 #endif
 
 #define TRUE  1
@@ -158,7 +172,6 @@
 # endif
 #endif
 
-/*! C++ users need love */
 #ifndef SG_END_DECL
 # ifdef __cplusplus
 #  define SG_END_DECL() }