X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b2252602473b26e442a9c96b4f28dc089deb19f4..9ca07b60d01ce5406d41903de5724b149e1620b8:/include/xbt/base.h

diff --git a/include/xbt/base.h b/include/xbt/base.h
index ae3f926f87..dcbaca2444 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -27,23 +27,23 @@
 #endif
 
 #if defined(__MINGW32__) && defined(__MINGW_PRINTF_FORMAT)
-  # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
+  # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
      __attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
 #else
-  # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
+  # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
      __attribute__((__format__ (__printf__, format_idx, arg_idx)))
 #endif
 
 #if defined(__MINGW32__) && defined(__MINGW_SCANF_FORMAT)
-  # define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
+  # define XBT_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
 #else
-  # define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
+  # define XBT_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
 #endif
 
-# define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
-# define _XBT_GNUC_UNUSED  __attribute__((__unused__))
+# define XBT_ATTRIB_NORETURN __attribute__((__noreturn__))
+# define XBT_ATTRIB_UNUSED  __attribute__((__unused__))
 
 /* Constructor priorities exist since gcc 4.3.  Apparently, they are however not
  * supported on Macs. */
@@ -56,16 +56,24 @@
 # endif
 # 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_NORETURN
-# define _XBT_GNUC_UNUSED
+#elif defined(_MSC_VER) /* Microsoft Visual Thing */
+# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
+# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
+# define XBT_ATTRIB_NORETURN __declspec(noreturn)
+# define XBT_ATTRIB_UNUSED
+# define _XBT_GNUC_CONSTRUCTOR(prio)
+# define _XBT_GNUC_DESTRUCTOR(prio)
+# define  _XBT_NEED_INIT_PRAGMA 1
+#else
+# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
+# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
+# define XBT_ATTRIB_NORETURN
+# define XBT_ATTRIB_UNUSED
 # define _XBT_GNUC_CONSTRUCTOR(prio)
 # define _XBT_GNUC_DESTRUCTOR(prio)
 # define  _XBT_NEED_INIT_PRAGMA 1
 
-#endif                          /* !__GNUC__ */
+#endif                          /* gcc or MSVC else */
 
 /* inline and __FUNCTION__ are only in GCC when -ansi is off */
 
@@ -149,6 +157,7 @@
 
 /*
  * Function calling convention (not used for now)
+ * http://unixwiz.net/techtips/win32-callconv.html <-- good documentation
  */
 
 #ifdef _XBT_WIN32
@@ -228,13 +237,27 @@
 
 
 /* UNIX build */
-#else
+#elif defined(__ELF__) 
+
 #  define XBT_PUBLIC(type)            type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern type
 #  define XBT_PUBLIC_CLASS            class
 
+#else
+#  define XBT_PUBLIC(type)            __attribute__((visibility("default"))) type
+#  define XBT_EXPORT_NO_IMPORT(type)  __attribute__((visibility("default"))) type
+#  define XBT_IMPORT_NO_EXPORT(type)  __attribute__((visibility("default"))) type
+#  define XBT_PUBLIC_DATA(type)       extern __attribute__((visibility("default"))) type
+#  define XBT_PUBLIC_CLASS            class __attribute__((visibility("default")))
+
+#endif
+
+#ifdef __ELF__
+#define XBT_PRIVATE __attribute__((visibility("hidden")))
+#else
+#define XBT_PRIVATE
 #endif
 
 #ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
@@ -252,14 +275,6 @@
 	#define _CRT_SECURE_NO_WARNINGS
 #endif
 
-
-
-#ifdef _XBT_WIN32
-#define XBT_INTERNAL
-#else
-#define XBT_INTERNAL __attribute__((visibility ("hidden")))
-#endif
-
 #if !defined (max) && !defined(__cplusplus)
 #  define max(a,b)  (((a) > (b)) ? (a) : (b))
 #endif