From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 15 Apr 2011 10:02:56 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
X-Git-Tag: v3.6_beta2~36
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/96920215fe6b67ec41f9e9dee856b5157a67f6d2?hp=da42da6b771f865f166bdbf32f4a907cd60c60c5

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
---

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 9a526f53ae..e5e48ce071 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -40,9 +40,22 @@ void SIMIX_context_mod_init(void)
       (*smx_factory_initializer_to_use)(&(simix_global->context_factory));
     }
     else { /* use the factory specified by --cfg=contexts/factory:value */
-      if (smx_context_factory_name == NULL || !strcmp(smx_context_factory_name, "ucontext")) {
+
+      if (smx_context_factory_name == NULL) {
+        /* use the default factory */
+#ifdef CONTEXT_UCONTEXT
+        SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#else
+        SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
+#endif
+      }
+      else if (!strcmp(smx_context_factory_name, "ucontext")) {
         /* use ucontext */
+#ifdef CONTEXT_UCONTEXT
         SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#else
+        xbt_die("The ontext factory 'ucontext' unavailable on your system");
+#endif
       }
       else if (!strcmp(smx_context_factory_name, "thread")) {
 	/* use os threads (either pthreads or windows ones) */
diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index 239d0a75ff..9327b59722 100644
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -14,12 +14,6 @@
 #  include <valgrind/valgrind.h>
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
 
-#ifdef _XBT_WIN32
-#include "win32_ucontext.h"
-#else
-#include "ucontext.h"
-#endif
-
 typedef char * raw_stack_t;
 typedef void (*rawctx_entry_point_t)(void *);