X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7410b72db09489e8b9d3ee3cb087f35882397d93..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/xbt/ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 37f1768373..0a4e65ec40 100644
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -56,16 +56,7 @@
 
 #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;
 
@@ -119,7 +110,7 @@ void xbt_backtrace_display_current(void)
   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"
@@ -154,7 +145,7 @@ void xbt_ex_display(xbt_ex_t * e)
     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");