X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f6cce43052e0225927222aae0e2284a832c3d35..666767f623cc55cc4524e84c4fe0f64b3dbd8bf9:/include/xbt/base.h

diff --git a/include/xbt/base.h b/include/xbt/base.h
index b5312f2226..c1ef5aeba9 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 */
 
@@ -89,7 +97,7 @@
 #        define XBT_INLINE
 #    endif
 #  else
-#     if defined (__VISUALC__)
+#     if defined (_MSC_VER)
 #       define XBT_INLINE __inline
 #     else
 #       define XBT_INLINE  inline
@@ -97,6 +105,20 @@
 #  endif /* __cplusplus */
 #endif
 
+#if defined(__GNUC__)
+#   define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline))
+#else
+#   define XBT_ALWAYS_INLINE XBT_INLINE
+#endif
+
+#if defined(__GNUC__)
+#   define XBT_THREAD_LOCAL __thread
+#elif defined(_MSC_VER)
+#   define XBT_THREAD_LOCAL __declspec(thread)
+#else
+#   define XBT_THREAD_LOCAL No thread local on this architecture
+#endif
+
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
 #ifdef MIN
 # undef MIN
@@ -135,6 +157,7 @@
 
 /*
  * Function calling convention (not used for now)
+ * http://unixwiz.net/techtips/win32-callconv.html <-- good documentation
  */
 
 #ifdef _XBT_WIN32
@@ -165,22 +188,22 @@
  *     by default.
  *
  *
- * Rational of XBT_EXPORT_NO_IMPORT: (windows-only cruft)
+ * Rational of XBT_EXPORT_NO_IMPORT: (windows-only)
  *   * Symbols which must be exported in the DLL, but not imported from it.
  *
  *   * This is obviously useful for initialized globals (which cannot be
  *     extern or similar).
- *   * This is also used in the log mecanism where a macro creates the
+ *   * This is also used in the log mechanism where a macro creates the
  *     variable automatically. When the macro is called from within SimGrid,
  *     the symbol must be exported, but when called  from within the client
  *     code, it must not try to retrieve the symbol from the DLL since it's
  *      not in there.
  *
- * Rational of XBT_IMPORT_NO_EXPORT: (windows-only cruft)
- *   * Symbols which must be imported from the DLL, but not explicitely
+ * Rational of XBT_IMPORT_NO_EXPORT: (windows-only)
+ *   * Symbols which must be imported from the DLL, but not explicitly
  *     exported from it.
  *
- *   * The root log category is already exported, but not imported explicitely
+ *   * The root log category is already exported, but not imported explicitly
  *     when creating a subcategory since we cannot import the parent category
  *     to deal with the fact that the parent may be in application space, not
  *     DLL space.
@@ -223,6 +246,23 @@
 
 #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
+
+/* 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