From 8cb6506f65799af09c57dfea8dd68d0ee40d4507 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 10 Feb 2016 16:40:34 +0100
Subject: [PATCH] [mc] Use ucontext_t instead of void* in some places

---
 src/include/mc/datatypes.h | 4 +++-
 src/include/mc/mc.h        | 4 +++-
 src/mc/mc_ignore.cpp       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 763b60dee6..0b45c09f97 100644
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -7,6 +7,8 @@
 #ifndef MC_DATATYPE_H
 #define MC_DATATYPE_H
 
+#include <ucontext.h>
+
 #include "xbt/misc.h"
 #include "xbt/swag.h"
 #include "xbt/fifo.h"
@@ -26,7 +28,7 @@ typedef struct s_mc_transition *mc_transition_t;
 
 typedef struct s_stack_region{
   void *address;
-  void *context;
+  ucontext_t* context;
   size_t size;
   int block;
   int process_index;
diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index eaeb396691..d3eadeabe2 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,6 +7,8 @@
 #ifndef _MC_MC_H
 #define _MC_MC_H
 
+#include <ucontext.h>
+
 #include "xbt/base.h"
 #include "xbt/misc.h"
 #include "xbt/fifo.h"
@@ -87,7 +89,7 @@ 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);
-XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, void *context, size_t size);
+XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size);
 
 /********************************* Memory *************************************/
 XBT_PUBLIC(void) MC_memory_init(void);  /* Initialize the memory subsystem */
diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index ccac7338fb..6017779fa2 100644
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -77,7 +77,7 @@ void MC_ignore_global_variable(const char *name)
  *  @param context
  *  @param size    Size of the stack
  */
-void MC_register_stack_area(void *stack, smx_process_t process, void *context, size_t size)
+void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
 {
   if (mc_mode != MC_MODE_CLIENT)
     return;
-- 
2.20.1