some compiler don't like this return void... :)

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 6476998..2949934 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -174,11 +174,11 @@ static int action_is_suspended(surf_action_t action)
 
 static void action_set_max_duration(surf_action_t action, double duration)
 {
-  if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    return surf_network_resource->common_public->set_max_duration(action,duration);
-  if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    return surf_cpu_resource->common_public->set_max_duration(action,duration);
-  DIE_IMPOSSIBLE;
+  if(action->resource_type==(surf_resource_t)surf_network_resource)
+    surf_network_resource->common_public->set_max_duration(action,duration);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->set_max_duration(action,duration);
+  else  DIE_IMPOSSIBLE;
 }
 
 static surf_action_t communicate(void *workstation_src,

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 95e1a24..3e0aa33 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -821,10 +821,10 @@ static int action_is_suspended(surf_action_t action)
 static void action_set_max_duration(surf_action_t action, double duration)
 {
   if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    return surf_network_resource->common_public->set_max_duration(action,duration);
-  if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    return surf_cpu_resource->common_public->set_max_duration(action,duration);
-  DIE_IMPOSSIBLE;
+    surf_network_resource->common_public->set_max_duration(action,duration);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->set_max_duration(action,duration);
+  else DIE_IMPOSSIBLE;
 }