X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..d04fca45db7b95d95da6615e54a38c467ef3c230:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index f222f62f28..5bcfdf9b5d 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -1,6 +1,6 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009-2014. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 #define _aligned_free  __mingw_aligned_free 
 #endif //MINGW
 
-
+#if defined(_XBT_WIN32)
+#include <malloc.h>
+#endif
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 # include <valgrind/valgrind.h>
@@ -85,6 +87,12 @@ void SIMIX_context_mod_init(void)
         /* use raw contexts */
         SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
       }
+#endif
+#ifdef HAVE_BOOST_CONTEXT
+      else if (!strcmp(smx_context_factory_name, "boost")) {
+        /* use Boost.Context */
+        SIMIX_ctx_boost_factory_init(&simix_global->context_factory);
+      }
 #endif
       else {
         XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");