From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 18 Jan 2008 09:58:48 +0000 (+0000)
Subject: Fix the prototype of the context running wrapper to stick to the standards
X-Git-Tag: v3.3~661
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a4464975caf1bb39f0870464045c753af5c578fd

Fix the prototype of the context running wrapper to stick to the standards

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5204 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/acmacro/context.m4 b/acmacro/context.m4
index f90eaf530f..2c2111314b 100644
--- a/acmacro/context.m4
+++ b/acmacro/context.m4
@@ -134,10 +134,8 @@ AC_TRY_RUN([
 ucontext_t uc_child;
 ucontext_t uc_main;
 
-void child(void *arg)
+void child(void)
 {
-    if (arg != (void *)12345)
-        exit(1);
     if (swapcontext(&uc_child, &uc_main) != 0)
         exit(2);
 }
diff --git a/src/xbt/xbt_ucontext.c b/src/xbt/xbt_ucontext.c
index 481b479208..16b7ac8ddc 100644
--- a/src/xbt/xbt_ucontext.c
+++ b/src/xbt/xbt_ucontext.c
@@ -65,8 +65,7 @@ xbt_ucontext_suspend(xbt_context_t context);
 static void
 xbt_ucontext_resume(xbt_context_t context);
 
-static void* 
-xbt_ucontext_wrapper(void* param);
+static void xbt_ucontext_wrapper(void);
 
 /* callback: context fetching */
 static ex_ctx_t*
@@ -228,7 +227,7 @@ xbt_ucontext_yield(void)
 static void 
 xbt_ucontext_start(xbt_context_t context)
 {
-	makecontext(&(((xbt_ucontext_t)context)->uc), (void (*)(void)) xbt_ucontext_wrapper, 1, context);
+	makecontext(&(((xbt_ucontext_t)context)->uc), xbt_ucontext_wrapper, 1, context);
 }
 
 static void 
@@ -258,14 +257,13 @@ xbt_ucontext_swap(xbt_context_t context)
 		xbt_ucontext_stop(1);
 }
 
-static void* 
-xbt_ucontext_wrapper(void* param)
+static void
+xbt_ucontext_wrapper(void)
 {
 	if (current_context->startup_func)
 		(*current_context->startup_func)(current_context->startup_arg);
 	
 	xbt_ucontext_stop((*(current_context->code))(current_context->argc, current_context->argv));
-	return NULL;
 }
 
 static void