X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b7ff86c51b392e6267c8b3341e28151ff6ef594..0bfb3cdebf6d1a0105a7a738a602015ed583a39e:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 2a8e02ea41..6a5f341ec0 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -115,14 +115,14 @@
 #  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			 __declspec(dllexport)
+#  define XBT_PUBLIC_DATA(type)	      __declspec(dllexport) type
 
 /* Pack everything up statically */
 #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_PUBLIC_DATA		  
+#  define XBT_PUBLIC_DATA(type)       type
      
 
 /* Link against the DLL */
@@ -130,23 +130,20 @@
 #  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				__declspec(dllimport)		
+#  define XBT_PUBLIC_DATA(type)		__declspec(dllimport) type
 
-/* Non-UNIX build. Let's keep sain here ;) */
+/* 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       
+#  define XBT_PUBLIC_DATA(type)       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
 
@@ -163,7 +160,6 @@
 # endif
 #endif
 
-/*! C++ users need love */
 #ifndef SG_END_DECL
 # ifdef __cplusplus
 #  define SG_END_DECL() }