[MSVC] use our extended xbt_malloc, but don't choke on 'strdup' that should read...

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index b5312f2..748b475 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -89,7 +89,7 @@
 #        define XBT_INLINE
 #    endif
 #  else
 #        define XBT_INLINE
 #    endif
 #  else

-#     if defined (__VISUALC__)
+#     if defined (_MSC_VER)

 #       define XBT_INLINE __inline
 #     else
 #       define XBT_INLINE  inline
 #       define XBT_INLINE __inline
 #     else
 #       define XBT_INLINE  inline


@@ -97,6 +97,12 @@
 #  endif /* __cplusplus */
 #endif
 
 #  endif /* __cplusplus */
 #endif
 

+#if defined(__GNUC__)
+#   define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline))
+#else
+#   define XBT_ALWAYS_INLINE XBT_INLINE
+#endif
+

 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
 #ifdef MIN
 # undef MIN
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
 #ifdef MIN
 # undef MIN


@@ -165,22 +171,22 @@
  *     by default.
  *
  *
  *     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).
  *   * 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.
  *
  *     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.
  *
  *     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.
  *     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.