From c17057f5df312c247010140721caf078c45e927a Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 14 Apr 2008 15:30:57 +0000
Subject: [PATCH 1/1] Forgot this one (sorry for the noise, I'm debugging using
 the buildbots)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5338 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/xbt/xbt_context.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/xbt/xbt_context.c b/src/xbt/xbt_context.c
index f3c9ecd62a..ea501608c7 100644
--- a/src/xbt/xbt_context.c
+++ b/src/xbt/xbt_context.c
@@ -10,7 +10,7 @@
 #include "portable.h"
 #include "xbt/log.h"
 #include "xbt/swag.h"
-#include "xbt_context_factory.h"
+#include "xbt_context_private.h"
 
 /* the context associated with the current process 				*/
 xbt_context_t current_context = NULL;
@@ -50,10 +50,10 @@ xbt_context_mod_init(void)
 
 		#ifdef CONTEXT_THREADS
 			/* context switch based os thread */
-			xbt_thread_context_factory_init(&context_factory);
+			xbt_ctx_thread_factory_init(&context_factory);
 		#elif !defined(WIN32)
 			/* context switch based ucontext */
-			xbt_ucontext_factory_init(&context_factory);
+			xbt_ctx_sysv_factory_init(&context_factory);
 		#else
 			/* context switch is not allowed on Windows */
 			#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
@@ -280,19 +280,19 @@ xbt_context_select_factory(const char* name)
 int
 xbt_context_init_factory_by_name(xbt_context_factory_t* factory, const char* name)
 {
-	if(!strcmp(name,"jcontext_factory"))
+	if(!strcmp(name,"java"))
 	{
-		return xbt_jcontext_factory_init(factory);	
+		return xbt_ctx_java_factory_init(factory);	
 	}
 	#ifdef CONTEXT_THREADS
-	else if(!strcmp(name,"thread_context_factory"))	
+	else if(!strcmp(name,"thread"))	
 	{
-		return xbt_thread_context_factory_init(factory);	
+		return xbt_ctx_thread_factory_init(factory);	
 	}
 	#elif !defined(WIN32)
-	else if(!strcmp(name,"ucontext_context_factory"))	
+	else if(!strcmp(name,"sysv"))
 	{
-		return xbt_ucontext_factory_init(factory);	
+		return xbt_ctx_sysv_factory_init(factory);	
 	}
 	#endif
 	
-- 
2.20.1