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 f90eaf5..2c21113 100644 (file)
--- 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 481b479..16b7ac8 100644 (file)
--- 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\r
 xbt_ucontext_resume(xbt_context_t context);\r
 \r
-static void* \r
-xbt_ucontext_wrapper(void* param);\r
+static void xbt_ucontext_wrapper(void);\r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r
@@ -228,7 +227,7 @@ xbt_ucontext_yield(void)
 static void \r
 xbt_ucontext_start(xbt_context_t context)\r
 {\r
-       makecontext(&(((xbt_ucontext_t)context)->uc), (void (*)(void)) xbt_ucontext_wrapper, 1, context);\r
+       makecontext(&(((xbt_ucontext_t)context)->uc), xbt_ucontext_wrapper, 1, context);\r
 }\r
 \r
 static void \r
@@ -258,14 +257,13 @@ xbt_ucontext_swap(xbt_context_t context)
                xbt_ucontext_stop(1);\r
 }\r
 \r
-static void* \r
-xbt_ucontext_wrapper(void* param)\r
+static void\r
+xbt_ucontext_wrapper(void)\r
 {\r
        if (current_context->startup_func)\r
                (*current_context->startup_func)(current_context->startup_arg);\r
        \r
        xbt_ucontext_stop((*(current_context->code))(current_context->argc, current_context->argv));\r
-       return NULL;\r
 }\r
 \r
 static void\r