dont load smpi.h when not needed: it breaks on MSVC

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 8a71c27..0455482 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -18,7 +18,9 @@
 #include "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "simgrid/sg_config.h"
 #include "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "simgrid/sg_config.h"

+#ifdef HAVE_SMPI

 #include "smpi/smpi_interface.h"
 #include "smpi/smpi_interface.h"

+#endif

 #include "mc/mc.h"
 #include "mc/mc_record.h"
 #include "simgrid/instr.h"
 #include "mc/mc.h"
 #include "mc/mc_record.h"
 #include "simgrid/instr.h"

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index da8704f..129cfd7 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -9,7 +9,6 @@
 #include "mc/mc.h"
 #include "mc/mc_replay.h"
 #include "xbt/dict.h"
 #include "mc/mc.h"
 #include "mc/mc_replay.h"
 #include "xbt/dict.h"

-#include "smpi/private.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
                                 "SIMIX network-related synchronization");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
                                 "SIMIX network-related synchronization");