#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
-#undef HAVE_BACKTRACE
-#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
-# define HAVE_BACKTRACE 1 /* Hello linux box */
-#endif
-
-#if defined(_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
-# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
-#endif
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER;
xbt_backtrace_display(&e);
}
-#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
+#if HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
#else
# include "src/xbt/backtrace_dummy.c"
int i;
int cutpath = 0;
TRY { // We don't want to have an exception while checking how to deal with the one we already have, do we?
- cutpath = sg_cfg_get_boolean("exception/cutpath");
+ cutpath = xbt_cfg_get_boolean("exception/cutpath");
} CATCH_ANONYMOUS { }
fprintf(stderr, "\n");