Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/include/xbt/base.h b/include/xbt/base.h
index bada2f8..285c3f6 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -9,32 +9,39 @@
 #ifndef XBT_BASE_H
 #define XBT_BASE_H
 
-#include "simgrid_config.h"
-
 /* Define _GNU_SOURCE for getline, isfinite, etc. */
 #ifndef _GNU_SOURCE
   #define _GNU_SOURCE
 #endif
 
+// 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>
-#endif
 
-#if defined(__MINGW32__) && defined(__MINGW_PRINTF_FORMAT)
   # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
      __attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
-#else
-  # 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_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
 #else
+  # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
+     __attribute__((__format__ (__printf__, format_idx, arg_idx)))
   # define XBT_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
 #endif
@@ -161,7 +168,7 @@
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern type
 #  define XBT_PUBLIC_CLASS            class
-#  define XBT_PRIVATE
+#  define XBT_PRIVATE                 /** @private */
 
 #endif