From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 19 Dec 2011 14:02:41 +0000 (+0100)
Subject: Rename MSG_TASK_CANCELLED by MSG_TASK_CANCELED
X-Git-Tag: v3_9_90~569^2~19^2~160
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0bb2f73d0ec9cd4db699a802178b21db75d8f2af

Rename MSG_TASK_CANCELLED by MSG_TASK_CANCELED
---

diff --git a/src/jmsg.c b/src/jmsg.c
index b25f487267..d7a2ae85b0 100644
--- 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 a41194248e..dc06f1bca8 100644
--- 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)