From efcbaa29db1ec8eddaafed404004d140e609df4d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 13 Sep 2015 23:20:24 +0200 Subject: [PATCH] [MSVC] don't declare the 'xbt' log channel both extern and local in xbt_main.c --- include/xbt/sysdep.h | 4 ++++ src/xbt/xbt_main.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index db811b1b05..bffd706ffb 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -54,7 +54,11 @@ XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN; } while (0) /** @} */ +#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL +XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); +#else XBT_LOG_EXTERNAL_CATEGORY(xbt); +#endif /* these ones live in str.h, but redeclare them here so that we do not need to load the whole str.h and its heavy dependencies */ diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index d07d4a3db9..4923f24b47 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -6,6 +6,8 @@ /* 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. */ +#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */ + #include "xbt/misc.h" #include "simgrid_config.h" /* _XBT_WIN32 */ #include "internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */ @@ -26,7 +28,6 @@ #include #endif -XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling"); XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); /* lives here even if that's a bit odd to solve linking issues: this is used in xbt_log_file_appender to detect whether SMPI is used (and thus whether we should unbench the writing to disk) */ -- 2.20.1