remove every XBT_USE_DEPRECATED parts

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index d9d4ac2..466e7a5 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -13,7 +13,7 @@
 
 /* Define _GNU_SOURCE for getline, isfinite, etc. */
 #ifndef _GNU_SOURCE
-       #define _GNU_SOURCE
+  #define _GNU_SOURCE
 #endif
 
 /* Attributes are only in recent versions of GCC */
@@ -56,7 +56,15 @@
 # endif
 # undef _XBT_NEED_INIT_PRAGMA
 
-#else                           /* !__GNUC__ */
+#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
@@ -65,7 +73,7 @@
 # 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
@@ -170,9 +179,6 @@
  *
  *   * If you build the DLL, define the DLL_EXPORT symbol so that all symbols
  *     actually get exported by this file.
-
- *   * If you do a static windows compilation, define DLL_STATIC, both when
- *     compiling the application files and when compiling the library.
  *
  *   * If you link your application against the DLL or if you do a UNIX build,
  *     don't do anything special. This file will do the right thing for you
@@ -207,57 +213,48 @@
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern __declspec(dllexport) type
 #  define XBT_PUBLIC_CLASS            class __declspec(dllexport)
-
-
-/* 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(type)       extern type
-#  define XBT_PUBLIC_CLASS            class
-
+#  define XBT_PRIVATE
 
 /* Link against the DLL */
-#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
+#elif (defined(_XBT_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)       extern __declspec(dllimport) type
 #  define XBT_PUBLIC_CLASS            class __declspec(dllimport)
+#  define XBT_PRIVATE
 
+#elif defined(__ELF__) 
+#  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")))
 
-/* UNIX build */
 #else
 #  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
 
 #endif
 
 #ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
-       #if defined(_WIN64)
-               typedef __int64 ssize_t;
-       #else
-               typedef long ssize_t;
-       #endif
+  #if defined(_WIN64)
+    typedef __int64 ssize_t;
+  #else
+    typedef long ssize_t;
+  #endif
 
 /* Microsoft wants to improve the code quality blah blah blah */
 /* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */
-       /* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
-       #define _CRT_NONSTDC_NO_WARNINGS
-       /* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
-       #define _CRT_SECURE_NO_WARNINGS
-#endif
-
-
-
-#ifdef _XBT_WIN32
-#define XBT_INTERNAL
-#else
-#define XBT_INTERNAL __attribute__((visibility ("hidden")))
+  /* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
+  #define _CRT_NONSTDC_NO_WARNINGS
+  /* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
+  #define _CRT_SECURE_NO_WARNINGS
 #endif
 
 #if !defined (max) && !defined(__cplusplus)