spell-checking

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index b3494fa160a599f03acf536914b078137c3ef352..1241b6366ef6dc9fa628db3ef75e7ba04fa62a5a 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -18,12 +18,33 @@
 
 /* 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)))
-# 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)))
+#endif
+
 # 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__)
@@ -144,22 +165,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.