Rename MSG_TASK_CANCELLED by MSG_TASK_CANCELED

diff --git a/src/jmsg.c b/src/jmsg.c
index b25f487..d7a2ae8 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -751,7 +751,7 @@ Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
   MSG_error_t rv = MSG_task_execute(task);
 
   jxbt_check_res("MSG_task_execute()", rv,
-                 MSG_HOST_FAILURE | MSG_TASK_CANCELLED,
+                 MSG_HOST_FAILURE | MSG_TASK_CANCELED,
                  bprintf("while executing task %s",
                          MSG_task_get_name(task)));
 }

diff --git a/src/jxbt_utilities.h b/src/jxbt_utilities.h
index a411942..dc06f1b 100644 (file)
--- a/src/jxbt_utilities.h
+++ b/src/jxbt_utilities.h
@@ -61,7 +61,7 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname,
       jxbt_throw_transfer_failure(env,detail); \
     } else if (res == MSG_TIMEOUT) { \
       jxbt_throw_time_out_failure(env,detail); \
-    } else if (res == MSG_TASK_CANCELLED){ \
+    } else if (res == MSG_TASK_CANCELED){ \
       jxbt_throw_task_cancelled(env,detail); \
    } } while (0)