/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/portable.h" /* execinfo when available */
+#include "src/internal_config.h" /* execinfo when available */
#include "xbt/synchro_core.h" /* xbt_thread_self_name */
#include "src/xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "surf/surf.h"
#include <stdio.h>
-#ifdef HAVE_EXECINFO_H
+#if HAVE_EXECINFO_H
# include <execinfo.h> /* Function backtrace */
#endif
#define show_int(data) show_it(data, "d")
#define show_double(data) show_it(data, "f")
-static int xbt_log_layout_format_doit(xbt_log_layout_t l,
- xbt_log_event_t ev,
- const char *msg_fmt)
+static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, const char *msg_fmt)
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
length = strtol(q, &q, 10);
goto handle_modifier;
case 'c': /* category name; LOG4J compliant
- should accept a precision postfix to show the
- hierarchy */
+ should accept a precision postfix to show the hierarchy */
show_string(ev->cat->name);
break;
case 'p': /* priority name; LOG4J compliant */
break;
case 'b': /* backtrace; called %throwable in LOG4J */
case 'B': /* short backtrace; called %throwable{short} in LOG4J */
-#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
+#if HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
{
xbt_ex_t e;