X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b356352e87ae00a20f737c48e19b0c8413455a..63727a6a5f22ba32d3c8c254d356c595273748c9:/src/bindings/java/jmsg.h

diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.h
index f101f73cb8..deba4ac89f 100644
--- a/src/bindings/java/jmsg.h
+++ b/src/bindings/java/jmsg.h
@@ -11,61 +11,50 @@
 #include <simgrid/msg.h>
 #include <jni.h>
 
-extern int JAVA_HOST_LEVEL;
-extern xbt_lib_t host_lib;
+SG_BEGIN_DECL()
 
+extern int JAVA_HOST_LEVEL;
 extern int JAVA_STORAGE_LEVEL;
-extern xbt_lib_t storage_lib;
 
-JavaVM *get_java_VM(void);
-JNIEnv *get_current_thread_env(void);
+JavaVM *get_java_VM();
+JNIEnv *get_current_thread_env();
 /**
- * This function throws the correct exception according to the status
- * provided.
+ * This function throws the correct exception according to the status provided.
  */
 void jmsg_throw_status(JNIEnv *env, msg_error_t status);
 
 /*
- * Class		org_simgrid_msg_Msg
- * Method		getClock
- * Signature	()D
+ * Class    org_simgrid_msg_Msg
+ * Method    getClock
+ * Signature  ()D
  */
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv *, jclass);
+
 /**
- * Class		org_simgrid_msg_Msg
- * Method		run
+ * Class    org_simgrid_msg_Msg
+ * Method    run
  */
-JNIEXPORT void JNICALL
-    JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
+JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit();
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
-                                       jstring jplatformFile);
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls);
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
-                                       jstring jdeploymentFile);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile);
 
+SG_END_DECL()
 #endif                          /* !MSG4JAVA_H */