A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Strict ANSI compilers (such as microsoft ones) do not allow non-constant initializers...
[simgrid.git]
/
src
/
xbt
/
ex.c
diff --git
a/src/xbt/ex.c
b/src/xbt/ex.c
index
1879b8b
..
ce75412
100644
(file)
--- a/
src/xbt/ex.c
+++ b/
src/xbt/ex.c
@@
-18,6
+18,7
@@
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/module.h" /* xbt_binary_name */
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/module.h" /* xbt_binary_name */
+#include "xbt_modinter.h" /* backtrace initialization headers */
#include "xbt/synchro.h" /* xbt_thread_self */
#include "gras/Virtu/virtu_interface.h" /* gras_os_myname */
#include "xbt/synchro.h" /* xbt_thread_self */
#include "gras/Virtu/virtu_interface.h" /* gras_os_myname */
@@
-28,7
+29,7
@@
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
-#if defined(WIN32) && defined(_M_IX86)
+#if defined(WIN32) && defined(_M_IX86)
&& !defined(__GNUC__)
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
@@
-55,13
+56,8
@@
ex_ctx_t *__xbt_ex_ctx_default(void) {
/* Change raw libc symbols to file names and line numbers */
void xbt_ex_setup_backtrace(xbt_ex_t *e);
/* Change raw libc symbols to file names and line numbers */
void xbt_ex_setup_backtrace(xbt_ex_t *e);
-void xbt_backtrace_current(xbt_ex_t *e) {
-#ifdef HAVE_BACKTRACE
- xbt_ex_setup_backtrace(e);
-#endif
-}
-
void xbt_backtrace_display(xbt_ex_t *e) {
void xbt_backtrace_display(xbt_ex_t *e) {
+ xbt_ex_setup_backtrace(e);
#ifdef HAVE_BACKTRACE
int i;
#ifdef HAVE_BACKTRACE
int i;
@@
-93,11
+89,10
@@
void xbt_backtrace_display_current(void) {
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
# include "backtrace_linux.c"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
# include "backtrace_linux.c"
-#elif (defined(WIN32) && defined (_M_IX86))
+#elif (defined(WIN32) && defined (_M_IX86))
&& !defined(__GNUC__)
# include "backtrace_windows.c"
#else
# include "backtrace_windows.c"
#else
-void xbt_ex_setup_backtrace(xbt_ex_t *e) {
-}
+# include "backtrace_dummy.c"
#endif
/** @brief shows an exception content and the associated stack if available */
#endif
/** @brief shows an exception content and the associated stack if available */