Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simgrid / sg_config.c

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 74f19c4..ae2e69a 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -18,6 +18,7 @@
 #include "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "simgrid/sg_config.h"
+#include "simgrid_config.h" /* what was compiled in? */
 #ifdef HAVE_SMPI
 #include "smpi/smpi_interface.h"
 #endif
@@ -772,7 +773,7 @@ void sg_config_init(int *argc, char **argv)
     //test is if( size >= thresholdN ) return valueN;
     //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
     //  or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
-    // SMPI model can be used without enable_smpi, so keep this the ifdef.
+    // SMPI model can be used without enable_smpi, so keep this out of the ifdef.
     xbt_cfg_register(&_sg_cfg_set, "smpi/bw_factor",
                      "Bandwidth factors for smpi.",
                      xbt_cfgelm_string, 1, 1, NULL);
@@ -934,7 +935,6 @@ void sg_config_init(int *argc, char **argv)
     sg_config_cmd_line(argc, argv);
 
     xbt_mallocator_initialization_is_done(SIMIX_context_is_parallel());
-
   } else {
     XBT_WARN("Call to sg_config_init() after initialization ignored");
   }