From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Tue, 29 May 2012 13:44:57 +0000 (+0200)
Subject: Make simgrid-java buildable after MSG_process_create_with_environment prototype change
X-Git-Tag: v3_9_90~569^2~19^2~60^2~6
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c5c3f1bfece15c7b3a17a4f41925eae5cd629507?ds=sidebyside

Make simgrid-java buildable after MSG_process_create_with_environment prototype change
---

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index e20c317cbe..ecb1890a4b 100644
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -137,10 +137,9 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
 						(xbt_main_func_t) jprocess,
 						/*data*/ jprocess,
 						host,
-						(double)jkill, /* kill time */
 						/*argc, argv, properties*/
 						0,NULL,NULL);
-
+  MSG_process_set_kill_time(process, (double)jkill);
   MSG_process_set_data(process,&process);
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
@@ -275,7 +274,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
-  MSG_error_t rv;
+	MSG_error_t rv;
   TRY {
   	 rv = MSG_process_sleep((double)jseconds);
   }