From 314c3d6a9ae66376eb5c1bc5f63b29e45e061051 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 5 Mar 2016 00:45:44 +0100
Subject: [PATCH 1/1] try to fix the windows build

---
 src/include/mc/datatypes.h | 9 +++++----
 src/include/mc/mc.h        | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 2ae50636a1..28e76d6055 100644
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -9,11 +9,10 @@
 
 #include <simgrid_config.h>
 #include <xbt/base.h>
-#include <ucontext.h>           /* context relative declarations */
 
-#if HAVE_MC
-#include <dwarf.h>
-#endif 
+#ifdef HAVE_UCONTEXT_H
+#include <ucontext.h>           /* context relative declarations */
+#endif
 
 SG_BEGIN_DECL()
 
@@ -21,7 +20,9 @@ typedef struct s_mc_transition *mc_transition_t;
 
 typedef struct s_stack_region{
   void *address;
+#ifdef HAVE_UCONTEXT_H
   ucontext_t* context;
+#endif
   size_t size;
   int block;
   int process_index;
diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 02e23c868b..0e8da694d7 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,12 +7,12 @@
 #ifndef _MC_MC_H
 #define _MC_MC_H
 
-#include <simgrid_config.h>
-#include <xbt/base.h>
-#include <xbt/misc.h>
+#include <src/internal_config.h>
 #include <simgrid/simix.h>
 #include <simgrid/modelchecker.h> /* our public interface (and definition of HAVE_MC) */
+#ifdef HAVE_UCONTEXT_H
 #include <ucontext.h>           /* context relative declarations */
+#endif
 
 /* Maximum size of the application heap.
  *
@@ -78,7 +78,9 @@ XBT_PUBLIC(void) MC_ignore_heap(void *address, size_t size);
 XBT_PUBLIC(void) MC_remove_ignore_heap(void *address, size_t size);
 XBT_PUBLIC(void) MC_ignore_local_variable(const char *var_name, const char *frame);
 XBT_PUBLIC(void) MC_ignore_global_variable(const char *var_name);
+#ifdef HAVE_UCONTEXT_H
 XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size);
+#endif
 
 /********************************* Memory *************************************/
 XBT_PUBLIC(void) MC_memory_init(void);  /* Initialize the memory subsystem */
-- 
2.20.1