model-checker : really fix mc dependancies with MC ON or OFF

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index d38acbd..be00ce8 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -11,6 +11,11 @@
 #include "xbt/swag.h"
 #include "xbt/fifo.h"
 
 #include "xbt/swag.h"
 #include "xbt/fifo.h"
 

+#if HAVE_MC
+#include <libunwind.h>
+#include <dwarf.h>
+#endif 
+

 SG_BEGIN_DECL()
 
 /******************************* Transitions **********************************/
 SG_BEGIN_DECL()
 
 /******************************* Transitions **********************************/

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 4d2e916..c19aa1f 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -23,8 +23,6 @@
 #include "mc/datatypes.h"
 #include "xbt/fifo.h"
 #include "xbt/config.h"
 #include "mc/datatypes.h"
 #include "xbt/fifo.h"
 #include "xbt/config.h"

-#include <libunwind.h>
-#include <dwarf.h>

 
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"
 
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"