From e9f853f7336f26b6e03a7a080ece1a25b20a5181 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 13 Sep 2015 22:32:10 +0200
Subject: [PATCH] dont load smpi.h when not needed: it breaks on MSVC

---
 src/simgrid/sg_config.c | 2 ++
 src/simix/smx_network.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 8a71c27f48..04554824e9 100644
--- 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"
+#ifdef HAVE_SMPI
 #include "smpi/smpi_interface.h"
+#endif
 #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 da8704f48d..129cfd7c93 100644
--- 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 "smpi/private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
                                 "SIMIX network-related synchronization");
-- 
2.20.1