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
give up on cross-compiling backtrace code from gcc: inline assembly code cannot be...
[simgrid.git]
/
src
/
xbt
/
ex.c
diff --git
a/src/xbt/ex.c
b/src/xbt/ex.c
index
365c922
..
4eeaba0
100644
(file)
--- a/
src/xbt/ex.c
+++ b/
src/xbt/ex.c
@@
-29,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
@@
-94,7
+94,7
@@
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_dummy.c"
# include "backtrace_windows.c"
#else
# include "backtrace_dummy.c"