From cad33b892ac4c3614de1e0f4c09a3fdce75577db Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 1 Nov 2016 00:30:25 +0100 Subject: [PATCH] try to fix the windows build (+clang-format) --- include/xbt/asserts.h | 2 +- src/xbt/log.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h index e268b0d619..30d9a34512 100644 --- a/include/xbt/asserts.h +++ b/include/xbt/asserts.h @@ -14,7 +14,7 @@ #include "xbt/ex.h" SG_BEGIN_DECL() -extern int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */ +XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */ /** * @addtogroup XBT_error diff --git a/src/xbt/log.c b/src/xbt/log.c index 571337d971..6362a34344 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -15,15 +15,16 @@ #include "src/xbt_modinter.h" -#include "xbt/misc.h" +#include "src/xbt/log_private.h" +#include "xbt/asserts.h" +#include "xbt/dynar.h" #include "xbt/ex.h" +#include "xbt/misc.h" #include "xbt/str.h" #include "xbt/sysdep.h" -#include "src/xbt/log_private.h" -#include "xbt/dynar.h" #include "xbt/xbt_os_thread.h" -int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */ +int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */ static xbt_os_mutex_t log_cat_init_mutex = NULL; /** \addtogroup XBT_log -- 2.20.1