X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..68fddbaeb8d7a332bec9eb09ef0e7e548ac1850c:/src/xbt/xbt_main.cpp diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp index d53d973cf2..f1736ce64a 100644 --- a/src/xbt/xbt_main.cpp +++ b/src/xbt/xbt_main.cpp @@ -7,14 +7,14 @@ #define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */ -#include -#include "xbt/misc.h" #include "simgrid_config.h" -#include "xbt/sysdep.h" +#include "xbt/config.h" +#include "xbt/dynar.h" #include "xbt/log.h" #include "xbt/log.hpp" -#include "xbt/dynar.h" -#include "xbt/config.h" +#include "xbt/misc.h" +#include "xbt/sysdep.h" +#include #include "xbt/module.h" /* this module */ @@ -23,12 +23,12 @@ #include "simgrid/sg_config.h" #include "src/internal_config.h" -#include +#include #ifdef _WIN32 -#include /* To silence MSVC on abort() */ +# include /* To silence MSVC on abort() */ #endif #if HAVE_UNISTD_H -# include +# include #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling"); @@ -85,7 +85,7 @@ static void xbt_preinit() #elif HAVE_SYSCONF xbt_pagesize = sysconf(_SC_PAGESIZE); #else - #error Cannot get page size. +# error Cannot get page size. #endif xbt_pagebits = log2(xbt_pagesize); @@ -135,7 +135,7 @@ void xbt_init(int *argc, char **argv) xbt_cmdline = xbt_dynar_new(sizeof(char*), NULL); for (int i = 0; i < *argc; i++) xbt_dynar_push(xbt_cmdline,&(argv[i])); - + xbt_log_init(argc, argv); }