[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 7e8ad78..748b475 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -1,6 +1,6 @@
 /* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
 
 /* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
 

-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -18,12 +18,33 @@
 
 /* Attributes are only in recent versions of GCC */
 #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
 
 /* Attributes are only in recent versions of GCC */
 #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))

-# define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
+
+/* On MinGW, stdio.h defines __MINGW_PRINTF_FORMAT and __MINGW_SCANF_FORMAT
+   which are the suitable format style (either gnu_printf or ms_printf)
+   depending on which version is available (__USE_MINGW_ANSI_STDIO): */
+#ifdef __MINGW32__
+  #include <stdio.h>
+#endif
+
+#if defined(__MINGW32__) && defined(__MINGW_PRINTF_FORMAT)
+  # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
+     __attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
+#else
+  # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \

      __attribute__((__format__ (__printf__, format_idx, arg_idx)))
      __attribute__((__format__ (__printf__, format_idx, arg_idx)))

-# define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
+#endif
+
+#if defined(__MINGW32__) && defined(__MINGW_SCANF_FORMAT)
+  # define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
+         __attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
+#else
+  # define _XBT_GNUC_SCANF( format_idx, arg_idx )     \

          __attribute__((__format__ (__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_GNUC_NORETURN __attribute__((__noreturn__))
 # define _XBT_GNUC_UNUSED  __attribute__((__unused__))

+

 /* Constructor priorities exist since gcc 4.3.  Apparently, they are however not
  * supported on Macs. */
 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && !defined(__APPLE__)
 /* Constructor priorities exist since gcc 4.3.  Apparently, they are however not
  * supported on Macs. */
 # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && !defined(__APPLE__)


@@ -64,13 +85,11 @@
 #        define XBT_INLINE inline
 #    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 #        define XBT_INLINE inline
 #        define XBT_INLINE inline
 #    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 #        define XBT_INLINE inline

-#    elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__)
-#        define XBT_INLINE __inline

 #    else
 #        define XBT_INLINE
 #    endif
 #  else
 #    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


@@ -78,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


@@ -146,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.