-/* 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 ) \
+// Teach the compiler that some code path is unreacheable:
+#if defined(__has_builtin)
+ #if __has_builtin(__builtin_unreachable)
+ #define XBT_UNREACHABLE() __builtin_unreachable()
+ #else
+ #include <stdlib.h>
+ #define XBT_UNREACHABLE() abort()
+ #endif
+#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+ #define XBT_UNREACHABLE() __builtin_unreachable()
+#else
+ #include <stdlib.h>
+ #define XBT_UNREACHABLE() abort()
+#endif
+
+/* 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>
+
+ # define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \
+ __attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
+ # define XBT_ATTRIB_SCANF( format_idx, arg_idx ) \
+ __attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
+#else
+ # define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) \