Merge pull request #256 from Flamefire/master

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index c33f60a..24f28c2 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -71,9 +71,9 @@
 #define XBT_ATTRIB_DEPRECATED(msg) __attribute__((deprecated(msg)))
 #endif
 
-#define XBT_ATTRIB_DEPRECATED_v319(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.19 */
 #define XBT_ATTRIB_DEPRECATED_v320(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.20 */
 #define XBT_ATTRIB_DEPRECATED_v321(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.21 */
+#define XBT_ATTRIB_DEPRECATED_v322(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.22 */
 
 #define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio)))
 #define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__(prio)))
@@ -156,41 +156,33 @@
 
 /* Build the DLL */
 #if defined(DLL_EXPORT)
-#  define XBT_ATTRIB_PUBLIC           __declspec(dllexport)
-#  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)       extern __declspec(dllexport) type
-#  define XBT_PUBLIC_CLASS            class __declspec(dllexport)
+#  define XBT_PUBLIC            __declspec(dllexport)
+#  define XBT_EXPORT_NO_IMPORT  __declspec(dllexport)
+#  define XBT_IMPORT_NO_EXPORT
+#  define XBT_PUBLIC_DATA       extern __declspec(dllexport)
 #  define XBT_PRIVATE
 
 /* Link against the DLL */
 #elif (defined(_WIN32) && !defined(DLL_EXPORT))
-#  define XBT_ATTRIB_PUBLIC           __declspec(dllimport)
-#  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)       extern __declspec(dllimport) type
-#  define XBT_PUBLIC_CLASS            class __declspec(dllimport)
+#  define XBT_PUBLIC            __declspec(dllimport)
+#  define XBT_EXPORT_NO_IMPORT
+#  define XBT_IMPORT_NO_EXPORT  __declspec(dllimport)
+#  define XBT_PUBLIC_DATA       extern __declspec(dllimport)
 #  define XBT_PRIVATE
 
 #elif defined(__ELF__)
-#  define XBT_ATTRIB_PUBLIC           __attribute__((visibility("default")))
-#  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")))
-#  define XBT_PRIVATE                 __attribute__((visibility("hidden")))
+#  define XBT_PUBLIC            __attribute__((visibility("default")))
+#  define XBT_EXPORT_NO_IMPORT  __attribute__((visibility("default")))
+#  define XBT_IMPORT_NO_EXPORT  __attribute__((visibility("default")))
+#  define XBT_PUBLIC_DATA       extern __attribute__((visibility("default")))
+#  define XBT_PRIVATE           __attribute__((visibility("hidden")))
 
 #else
-#  define XBT_ATTRIB_PUBLIC           /* public */
-#  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
-#  define XBT_PRIVATE                 /** @private */
+#  define XBT_PUBLIC            /* public */
+#  define XBT_EXPORT_NO_IMPORT
+#  define XBT_IMPORT_NO_EXPORT
+#  define XBT_PUBLIC_DATA       extern
+#  define XBT_PRIVATE           /** @private */
 
 #endif