Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Avoid a name conflict with /usr/include/sys/wait.h on mac (at least)
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 11 Dec 2009 12:26:49 +0000 (12:26 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 11 Dec 2009 12:26:49 +0000 (12:26 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6887 48e7efb5-ca39-0410-a469-dd3cf9ba447f

examples/msg/actions/actions.c

index 0a92faf..41d35f9 100644 (file)
@@ -131,7 +131,7 @@ static void Irecv(xbt_dynar_t action)
 }
 
 
 }
 
 
-static void wait(xbt_dynar_t action)
+static void wait_action(xbt_dynar_t action)
 {
   char *name = xbt_str_join(action, " ");
   char task_name[80];
 {
   char *name = xbt_str_join(action, " ");
   char task_name[80];
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
   MSG_action_register("Isend", Isend);
   MSG_action_register("recv", recv);
   MSG_action_register("Irecv", Irecv);
   MSG_action_register("Isend", Isend);
   MSG_action_register("recv", recv);
   MSG_action_register("Irecv", Irecv);
-  MSG_action_register("wait", wait);
+  MSG_action_register("wait", wait_action);
   MSG_action_register("barrier", barrier);
   MSG_action_register("bcast", bcast);
   MSG_action_register("reduce", reduce);
   MSG_action_register("barrier", barrier);
   MSG_action_register("bcast", bcast);
   MSG_action_register("reduce", reduce);