From 34bfa2df7fec3c52c49725da5c9aae299081583a Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@gmail.com>
Date: Wed, 4 Dec 2019 19:04:51 +0100
Subject: [PATCH] fix MC build

---
 src/mc/Session.cpp                 | 2 +-
 src/smpi/internals/smpi_config.cpp | 3 +++
 src/smpi/internals/smpi_global.cpp | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index a5721e3e46..e0f28cf2f7 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -52,7 +52,7 @@ static void setup_child_environment(int socket)
 Session::Session(const std::function<void()>& code)
 {
 #if HAVE_SMPI
-  xbt_assert(smpi_privatize_global_variables != SmpiPrivStrategies::MMAP,
+  xbt_assert(smpi_cfg_privatization() != SmpiPrivStrategies::MMAP,
              "Please use the dlopen privatization schema when model-checking SMPI code");
 #endif
 
diff --git a/src/smpi/internals/smpi_config.cpp b/src/smpi/internals/smpi_config.cpp
index 68f3b67e01..61cb842ca5 100644
--- a/src/smpi/internals/smpi_config.cpp
+++ b/src/smpi/internals/smpi_config.cpp
@@ -11,6 +11,9 @@
 #include <boost/algorithm/string.hpp> /* trim */
 #include <boost/tokenizer.hpp>
 
+#if SIMGRID_HAVE_MC
+#include "src/mc/mc_config.hpp"
+#endif
 
 #if defined(__APPLE__)
 # include <AvailabilityMacros.h>
diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 9955d920f9..fb03f4a196 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -24,10 +24,6 @@
 #include <fstream>
 #include <sys/stat.h>
 
-#if SIMGRID_HAVE_MC
-#include "src/mc/mc_config.hpp"
-#endif
-
 #if SG_HAVE_SENDFILE
 #include <sys/sendfile.h>
 #endif
-- 
2.20.1